fixed makefile

5 files changed, 38 insertions, 32 deletions

diff --git a/3dnav.cbp b/3dnav.cbp
index 8fd8b2c..a152d3b 100644
--- a/3dnav.cbp
+++ b/3dnav.cbp
@@ -114,6 +114,12 @@
 		<Unit filename="config.make">
 			<Option virtualFolder="build config" />
 		</Unit>
+		<Unit filename="src/keyVar.cpp">
+			<Option virtualFolder="src/" />
+		</Unit>
+		<Unit filename="src/keyVar.h">
+			<Option virtualFolder="src/" />
+		</Unit>
 		<Unit filename="src/main.cpp">
 			<Option virtualFolder="src/" />
 		</Unit>
diff --git a/3dnav.layout b/3dnav.layout
index 4f39931..1a85030 100644
--- a/3dnav.layout
+++ b/3dnav.layout
@@ -4,14 +4,14 @@
 	<File name="../../../addons/ofx3DModelLoader/src/3DS/model3DS.h" open="0" top="0" tabpos="0">
 		<Cursor position="136" topLine="0" />
 	</File>
-	<File name="config.make" open="0" top="0" tabpos="3">
-		<Cursor position="173" topLine="0" />
+	<File name="config.make" open="1" top="0" tabpos="5">
+		<Cursor position="168" topLine="0" />
 	</File>
-	<File name="src/main.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="0" topLine="0" />
+	<File name="src/main.cpp" open="1" top="1" tabpos="3">
+		<Cursor position="516" topLine="0" />
 	</File>
-	<File name="src/testApp.cpp" open="1" top="1" tabpos="2">
-		<Cursor position="1239" topLine="41" />
+	<File name="src/testApp.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="813" topLine="0" />
 	</File>
 	<File name="src/testApp.h" open="1" top="0" tabpos="1">
 		<Cursor position="698" topLine="4" />
diff --git a/Makefile b/Makefile
index 2db4a8b..0862bed 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ else
 endif
 LIB_STATIC = $(shell ls $(OF_ROOT)/libs/*/lib/$(LIBSPATH)/*.a  2> /dev/null | grep -v openFrameworksCompiled | grep -v Poco)
 LIB_SHARED = $(shell ls $(OF_ROOT)/libs/*/lib/$(LIBSPATH)/*.so  2> /dev/null | grep -v openFrameworksCompiled | sed "s/.*\\/lib\([^/]*\)\.so/-l\1/")
-LIB_STATIC += $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoNet.a ../../../libs/poco/lib/$(LIBSPATH)/libPocoXML.a ../../../libs/poco/lib/$(LIBSPATH)/libPocoUtil.a ../../../libs/poco/lib/$(LIBSPATH)/libPocoFoundation.a
+LIB_STATIC += $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoNet.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoXML.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoUtil.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoFoundation.a
 LIB_PATHS_FLAGS = $(shell ls -d $(OF_ROOT)/libs/*/lib/$(LIBSPATH) | sed "s/\(\.*\)/-L\1/")
 
 CFLAGS += -Wall -fexceptions
@@ -142,14 +142,14 @@ ifeq ($(findstring addons.make,$(wildcard *.make)),addons.make)
 	else
 		ADDONS = $(shell cat addons.make)
 	endif
-	
+
 	ifneq ($(strip $(ADDONS)),)
 	    ADDONS_REL_DIRS = $(addsuffix /src, $(ADDONS))
 	    ADDONS_LIBS_REL_DIRS = $(addsuffix /libs, $(ADDONS))
 	    ADDONS_DIRS = $(addprefix $(OF_ROOT)/addons/, $(ADDONS_REL_DIRS) )
 	    ADDONS_LIBS_DIRS = $(addprefix $(OF_ROOT)/addons/, $(ADDONS_LIBS_REL_DIRS) )
 	    ADDONS_BIN_LIBS_DIRS = $(addsuffix /*/lib/$(LIBSPATH), $(ADDONS_LIBS_DIRS) )
-	
+
 	    ADDONS_INCLUDES = $(ADDONS_DIRS)
 	    ADDONS_INCLUDES = $(ADDONS_LIBS_DIRS)
 	    ADDONS_INCLUDES += $(shell find $(ADDONS_DIRS) -type d 2> /dev/null)
@@ -220,7 +220,7 @@ ifeq ($(ARCH),android)
 		TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworks_neon.a
 		USER_LIBS = $(USER_LIBS_NEON)
 	endif
-	
+
 	ifeq ($(findstring TestLink,$(MAKECMDGOALS)),TestLink)
 		TARGET_NAME = Debug
 		TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/$(ARCH)/libopenFrameworksDebug.a
@@ -323,7 +323,7 @@ $(OBJ_OUTPUT)%.o: $(OF_ROOT)/%.c
 	@echo "compiling addon object for" $<
 	mkdir -p $(@D)
 	$(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o $@ -c $<
-	
+
 $(OBJ_OUTPUT)%.o: $(OF_ROOT)/%.cc
 	@echo "compiling addon object for" $<
 	mkdir -p $(@D)
@@ -333,7 +333,7 @@ $(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.c
 	@echo "compiling object for: " $<
 	mkdir -p $(@D)
 	$(CC) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $<
-	
+
 $(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.cc
 	@echo "compiling object for: " $<
 	mkdir -p $(@D)
@@ -343,7 +343,7 @@ $(OBJ_OUTPUT)%.o: $(USER_SOURCE_DIR)/%.cpp
 	@echo "compiling object for: " $<
 	mkdir -p $(@D)
 	$(CXX) $(TARGET_CFLAGS) $(CFLAGS) $(ADDONSCFLAGS) $(USER_CFLAGS) -MMD -MP -MF$(OBJ_OUTPUT)$*.d -MT$(OBJ_OUTPUT)$*.d -o$@ -c $<
-	
+
 $(TARGET): $(OBJS) $(ADDONS_OBJS) $(USER_OBJS) $(TARGET_LIBS) $(LIB_STATIC)
 	@echo 'linking $(TARGET)'
 	mkdir -p $(@D)
@@ -356,7 +356,7 @@ clean:
 	rm -rf $(OBJ_OUTPUT)
 	rm -f $(TARGET)
 	rm -r bin/libs
-	
+
 $(CLEANTARGET):
 	rm -rf $(OBJ_OUTPUT)
 	rm -f $(TARGET)
@@ -371,49 +371,49 @@ CleanAndroid:
 
 afterDebugAndroid:$(TARGET)
 	@if [ -d libs/armeabi-v7a ]; then rm -r libs/armeabi-v7a; fi
-	
+
 	@cp $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver libs/armeabi
-	
+
 	#create gdb.setup for armeabi
 	@echo "set solib-search-path $(PWD)/obj/local/armeabi:$(PWD)/libs/armeabi" > libs/armeabi/gdb.setup
 	@echo "directory $(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include" >> libs/armeabi/gdb.setup
 	@echo "directory $(PWD)/src" >> libs/armeabi/gdb.setup
 	@echo "directory $(NDK_ROOT)/sources/cxx-stl/system" >> libs/armeabi/gdb.setup
-	@echo "directory $(PWD)/libs/armeabi" >> libs/armeabi/gdb.setup 
-	@echo "" >> libs/armeabi/gdb.setup 
-	
+	@echo "directory $(PWD)/libs/armeabi" >> libs/armeabi/gdb.setup
+	@echo "" >> libs/armeabi/gdb.setup
+
 	@if [ ! -d jni ]; then mkdir jni; fi
 	@echo "APP_ABI := armeabi" > jni/Application.mk
 	@echo "#LOCAL_MODULE := OFAndroidApp" > jni/Android.mk
 
 afterReleaseAndroid:$(TARGET)
 	@if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi
-	
+
 	@cp $(OF_ROOT)/libs/openFrameworksCompiled/project/android/libneondetection.so libs/armeabi-v7a/
 	@cp $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver libs/armeabi-v7a
-	
+
 	#create gdb.setup for armeabi-v7a
 	@echo "set solib-search-path $(PWD)/obj/local/armeabi-v7a:$(PWD)/libs/armeabi-v7a" > libs/armeabi-v7a/gdb.setup
 	@echo "directory $(NDK_ROOT)/platforms/$(NDK_PLATFORM)/arch-arm/usr/include" >> libs/armeabi-v7a/gdb.setup
 	@echo "directory $(PWD)/src" >> libs/armeabi-v7a/gdb.setup
 	@echo "directory $(NDK_ROOT)/sources/cxx-stl/system" >> libs/armeabi-v7a/gdb.setup
-	@echo "directory $(PWD)/libs/armeabi-v7a" >> libs/armeabi-v7a/gdb.setup 
-	@echo "" >> libs/armeabi-v7a/gdb.setup 
-	
+	@echo "directory $(PWD)/libs/armeabi-v7a" >> libs/armeabi-v7a/gdb.setup
+	@echo "" >> libs/armeabi-v7a/gdb.setup
+
 	@if [ ! -d jni ]; then mkdir jni; fi
 	@echo "APP_ABI := armeabi armeabi-v7a" > jni/Application.mk
 	@echo "#LOCAL_MODULE := OFAndroidApp" > jni/Android.mk
 
 RESNAME=$(shell echo $(APPNAME)Resources | tr '[A-Z]' '[a-z]')
 
-AndroidInstall:	
+AndroidInstall:
 	if [ -d "bin/data" ]; then \
 		mkdir -p res/raw; \
 		rm res/raw/$(RESNAME).zip; \
 		cd bin/data; \
 		zip -r ../../res/raw/$(RESNAME).zip *; \
 		cd ../..; \
-	fi 
+	fi
 	if [ -f obj/$(BIN_NAME) ]; then rm obj/$(BIN_NAME); fi
 	#touch AndroidManifest.xml
 	$(SDK_ROOT)/tools/android update project --target $(NDK_PLATFORM) --path $(PROJECT_PATH)
diff --git a/config.make b/config.make
index cc16340..c3c4e2f 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_ROOT = ../of_preRelease_v007_linux
 
 
 # USER_CFLAGS allows to pass custom flags to the compiler
diff --git a/src/main.cpp b/src/main.cpp
index f64c8be..0cd85f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,13 +2,13 @@
 #include "testApp.h"
 #include "ofAppGlutWindow.h"
 
-// Includes for Mac OSX 
- 
+// Includes for Mac OSX
+ /*
 #include <GLUT/glut.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 
-/*
+/
 //Includes for Windows
 
 #include <GL/glew.h>
@@ -22,8 +22,8 @@ int main( ){
 
     ofAppGlutWindow window;
 	ofSetupOpenGL(&window, 600,600, OF_WINDOW);			// <-------- setup the GL context
-	glutIgnoreKeyRepeat(1);
-	printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
+	//glutIgnoreKeyRepeat(1);
+	//printf("key repeat ignore: %i\n",glutDeviceGet(GLUT_DEVICE_IGNORE_KEY_REPEAT));
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too: