Browse Source

Xcode: Build fixes. Ignoring asn1c generated files.

import_own_key
Dirk Zimmermann 6 years ago
parent
commit
1544427e13
4 changed files with 24 additions and 2 deletions
  1. +5
    -0
      .hgignore
  2. +1
    -1
      asn.1/Makefile
  3. +15
    -0
      build-mac/README.md
  4. +3
    -1
      build-mac/pEpEngine.xcodeproj/project.pbxproj

+ 5
- 0
.hgignore View File

@ -1,3 +1,8 @@
syntax: regexp
^asn\.1/.*\.(c|h)$
^asn\.1/Makefile\.am\.sample$
^asn\.1/libasn1\.a$
syntax: glob
*.orig
*.d


+ 1
- 1
asn.1/Makefile View File

@ -10,7 +10,7 @@ generate: DeviceGroup-Protocol.c
rm -f converter-sample.c
%.o: %.c %.h
$(CC) $(CFLAGS) $(OPTIMIZE) -I$(ASN1C_INCLUDE) -c $< -o $@
$(CC) $(CFLAGS) $(OPTIMIZE) -I. -I$(ASN1C_INCLUDE) -c $< -o $@
DeviceGroup-Protocol.c: devicegroup.asn1
$(ASN1C) -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 $<


+ 15
- 0
build-mac/README.md View File

@ -0,0 +1,15 @@
# Building for iOS
This is done with Xcode. Simply add `pEpEngine.xcodeproj` to
your project and add a dependency to the target `pEpEngine`
(in `Target Dependencies` in your `Build Phases`.
Usually you just integrate `pEpiOSAdapter.xcodeproj`.
## Dependencies
You need a working [asn1c](https://lionet.info/asn1c/blog/).
```
brew install asn1c
```

+ 3
- 1
build-mac/pEpEngine.xcodeproj/project.pbxproj View File

@ -677,7 +677,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h} \"$BUILT_PRODUCTS_DIR/include\"\n";
shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h} \"$BUILT_PRODUCTS_DIR/include\"\n\npushd ../asn.1\nmake generate\nmake\npopd";
};
/* End PBXShellScriptBuildPhase section */
@ -826,6 +826,7 @@
"$(SRCROOT)/../../netpgp-et/include/",
"$(SRCROOT)/../../netpgp-et/src/",
"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
"$(SRCROOT)/../asn.1/",
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@ -869,6 +870,7 @@
"$(SRCROOT)/../../netpgp-et/include/",
"$(SRCROOT)/../../netpgp-et/src/",
"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
"$(SRCROOT)/../asn.1/",
);
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;


Loading…
Cancel
Save