tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mapbox/llmr-native

Browse Source
This commit is contained in:
Dane Springmeyer
2014-02-04 20:57:08 -08:00
parent a2ab743475 e2ea6c52a7
commit bf916ae1e2
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -15,21 +15,28 @@ app: config.gypi src macosx/llmr-app.gyp
make -C build/macosx-make V=$(V)
open build/macosx-make/out/Release/llmr.app
# build just xcode project for libllmr
xcode: config.gypi llmr.gyp
deps/run_gyp llmr.gyp -Goutput_dir=./out/ --depth=. --generator-output=./ -f xcode
# build OS X with xcodebuild
xapp: xcode config.gypi src macosx/llmr-app.gyp
# build OS X app with xcodebuild
xapp: config.gypi src macosx/llmr-app.gyp
deps/run_gyp macosx/llmr-app.gyp -Goutput_dir=./out/ --depth=. --generator-output=./ -f xcode
xcodebuild -project ./macosx/llmr-app.xcodeproj
open macosx/build/Release/llmr.app
# build iOS app with xcodebuild
iapp: xcode config.gypi src ios/llmr-app.gyp
iapp: config.gypi src ios/llmr-app.gyp
deps/run_gyp ios/llmr-app.gyp -Goutput_dir=./out/ --depth=. --generator-output=./ -f xcode
xcodebuild -project ./ios/llmr-app.xcodeproj
# launch app with ios-sim?
isim: config.gypi src ios/llmr-app.gyp
deps/run_gyp ios/llmr-app.gyp -Goutput_dir=./out/ --depth=. --generator-output=./ -f xcode
xcodebuild -project ./ios/llmr-app.xcodeproj -arch i386 -sdk iphonesimulator
# does not work
#"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" -SimulateApplication ios/build/Release-iphonesimulator/llmr.app/llmr
clean:
-rm -rf out
-rm -rf build

1
common.gypi
View File

@@ -5,7 +5,6 @@
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'ONLY_ACTIVE_ARCH': 1
},
'cflags':['-std=c++11'],
'configurations': {

6
ios/llmr-app.gyp
View File

@@ -28,12 +28,12 @@
],
},
'xcode_settings': {
'ARCHS': [ "armv7", "armv7s", "arm64" ],
'SUPPORTED_PLATFORMS': [ 'iphoneos', 'iphonesimulator' ],
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos'],
'ARCHS': [ "armv7", "armv7s", "arm64", "i386" ],
'OTHER_LDFLAGS': [
'-stdlib=libc++'
],
'SDKROOT': 'iphoneos',
'INFOPLIST_FILE': 'Info.plist',
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD':'c++11',

25
llmr.gyp
View File

@@ -14,9 +14,12 @@
],
'xcode_settings': {
'SDKROOT': 'macosx',
'SUPPORTED_PLATFORMS':'macosx',
'SUPPORTED_PLATFORMS':['macosx'],
'MACOSX_DEPLOYMENT_TARGET':'10.8',
'PUBLIC_HEADERS_FOLDER_PATH': 'include'
'PUBLIC_HEADERS_FOLDER_PATH': 'include',
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'include_dirs':[
'./include'
@@ -24,11 +27,6 @@
'cflags': [
'<@(png_cflags)'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'direct_dependent_settings': {
'include_dirs':[
'./include'
@@ -66,12 +64,16 @@
],
'xcode_settings': {
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos'],
'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos',],
'ARCHS': [ "armv7", "armv7s", "arm64", "i386" ],
'TARGETED_DEVICE_FAMILY': '1,2',
'CODE_SIGN_IDENTITY': 'iPhone Developer',
'IPHONEOS_DEPLOYMENT_TARGET': '5.0',
'PUBLIC_HEADERS_FOLDER_PATH': 'include',
'GCC_INPUT_FILETYPE':'sourcecode.cpp.cpp'
'GCC_INPUT_FILETYPE':'sourcecode.cpp.cpp',
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'include_dirs':[
'./include'
@@ -79,11 +81,6 @@
'cflags': [
'<@(png_cflags)'
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(png_cflags)'
]
},
'direct_dependent_settings': {
'include_dirs':[
'./include'