diff options
| author | Tim <tim@Admins-Mac-Pro-2.local> | 2013-06-20 10:04:58 +0100 |
|---|---|---|
| committer | Tim <tim@Admins-Mac-Pro-2.local> | 2013-06-20 10:04:58 +0100 |
| commit | d836325685bfcb269a46881fc0cb67628f15bc11 (patch) | |
| tree | a4864321a8806322eedb7a02a5c403be3bef970f /06_performance/config.make | |
| parent | 51d327513ba268d245527ff59bd208ed907ffe6e (diff) | |
| parent | 39bcb5346b1f746399192391b6699e81d0d8ad3a (diff) | |
Merge branch 'master' of eclectronics.org@eclectronics.org:TRSS
Conflicts:
04_playobjects/src/testApp.h
Diffstat (limited to '06_performance/config.make')
| -rw-r--r-- | 06_performance/config.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/06_performance/config.make b/06_performance/config.make index 261aa2e..e8ff248 100644 --- a/06_performance/config.make +++ b/06_performance/config.make @@ -3,7 +3,7 @@ # OF_ROOT allows to move projects outside apps/* just set this variable to the # absoulte path to the OF root folder -OF_ROOT = ../openFrameworks +OF_ROOT = ../../openFrameworks # USER_CFLAGS allows to pass custom flags to the compiler @@ -17,7 +17,7 @@ USER_CFLAGS = -I $(OF_ROOT)/addons/ofxOpenNI/include/openni -I $(OF_ROOT)/addons # for example libraries like: # USER_LDFLAGS = libs/libawesomelib.a -USER_LDFLAGS = -lusb-1.0 +USER_LDFLAGS = -lusb-1.0 -lOpenNI EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj" @@ -53,4 +53,4 @@ NDK_PLATFORM = android-8 LINUX_ARM7_COMPILER_OPTIMIZATIONS = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=hard -mfpu=vfp - +CXX=colorgcc |