fix for git OF

1 files changed, 30 insertions, 7 deletions

diff --git a/config.make b/config.make
index 53a01ea..794005e 100644
--- a/config.make
+++ b/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 = ../of_preRelease_v007_linux/
+OF_ROOT = ../openFrameworks
 
 
 # USER_CFLAGS allows to pass custom flags to the compiler
@@ -15,20 +15,43 @@ USER_CFLAGS =
 
 # USER_LDFLAGS allows to pass custom flags to the linker
 # for example libraries like:
-# USER_LD_FLAGS = libs/libawesomelib.a
+# USER_LDFLAGS = libs/libawesomelib.a
 
 USER_LDFLAGS =
 
 
-# use this to add system libraries for example:
-# USER_LIBS = -lpango
+EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj"
+
+# change this to add different compiler optimizations to your project
+
+USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os
 
 USER_LIBS = -lavahi-core -lavahi-client
 
+# android specific, in case you want to use different optimizations
+USER_LIBS_ARM =
+USER_LIBS_ARM7 =
+USER_LIBS_NEON =
 
-# change this to add different compiler optimizations to your project
+# android optimizations
+
+ANDROID_COMPILER_OPTIMIZATION = -Os
+
+NDK_PLATFORM = android-8
+
+# uncomment this for custom application name (if the folder name is different than the application name)
+#APPNAME = folderName
+
+# uncomment this for custom package name, must be the same as the java package that contains OFActivity
+#PKGNAME = cc.openframeworks.$(APPNAME)
+
+
+
+
+
+# linux arm flags
+
+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
 
-USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os
 
 
-EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj"