Commit a891fb99 authored by Miro Knejp's avatar Miro Knejp

Cleanup the example project

- Remove all generated code from the primary Xcode project
- Include generated .cpp files in libtextsort for records with derivings
- Handwritten objc sources no longer need to be .mm
- Rename main.m to .mm for C++ standard library linking
- Add libdjinni to Xcode workspace for convenience
parent 1438ed53
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"sources": [ "sources": [
"../support-lib/jni/djinni_main.cpp", "../support-lib/jni/djinni_main.cpp",
"<!@(python glob.py generated-src/jni '*.cpp')", "<!@(python glob.py generated-src/jni '*.cpp')",
"<!@(python glob.py generated-src/cpp '*.cpp')",
"<!@(python glob.py handwritten-src/cpp '*.cpp')", "<!@(python glob.py handwritten-src/cpp '*.cpp')",
], ],
"include_dirs": [ "include_dirs": [
...@@ -26,8 +27,9 @@ ...@@ -26,8 +27,9 @@
"../support-lib/support_lib.gyp:djinni_objc", "../support-lib/support_lib.gyp:djinni_objc",
], ],
"sources": [ "sources": [
"<!@(python glob.py generated-src/objc '*.cpp' '*.mm' '*.m')", "<!@(python glob.py generated-src/objc '*.cpp' '*.mm' '*.m')",
"<!@(python glob.py handwritten-src/cpp '*.cpp')", "<!@(python glob.py generated-src/cpp '*.cpp')",
"<!@(python glob.py handwritten-src/cpp '*.cpp')",
], ],
"include_dirs": [ "include_dirs": [
"generated-src/objc", "generated-src/objc",
......
...@@ -7,4 +7,7 @@ ...@@ -7,4 +7,7 @@
<FileRef <FileRef
location = "group:../../build_ios/example/libtextsort.xcodeproj"> location = "group:../../build_ios/example/libtextsort.xcodeproj">
</FileRef> </FileRef>
<FileRef
location = "group:../../build_ios/support-lib/support_lib.xcodeproj">
</FileRef>
</Workspace> </Workspace>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment