diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig')
| -rw-r--r-- | ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig b/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig deleted file mode 100644 index 1a590ae..0000000 --- a/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/Project.xcconfig +++ /dev/null @@ -1,14 +0,0 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED -OF_PATH = ../../.. - -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/iphone/CoreOF.xcconfig" - -OTHER_LDFLAGS = $(OF_CORE_LIBS) -HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) - -COMPRESS_PNG_FILES = NO -GCC_THUMB_SUPPORT = NO -IPHONEOS_DEPLOYMENT_TARGET = 3.1 -TARGETED_DEVICE_FAMILY = 1 |