Move engine files to engine dir

Makefile

@@ -14,6 +14,8 @@ endif
 
 TARGET_NAME := modelviewer_location
 
+INCFLAGS = -I. -Iengine
+
 ifneq (,$(findstring unix,$(platform)))
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
@@ -30,7 +32,7 @@ else ifneq (,$(findstring osx,$(platform)))
    SHARED := -dynamiclib
    GL_LIB := -framework OpenGL
    LIBS += -lz
-   INCFLAGS = -Iinclude/compat
+   INCFLAGS += -Iinclude/compat
    DEFINES := -DOSX
    CXXFLAGS += $(DEFINES)
 else ifeq ($(platform), ios)
@@ -44,7 +46,7 @@ else ifeq ($(platform), ios)
 	CXXFLAGS += -miphoneos-version-min=5.0
 	DEFINES := -DIOS
 	CXXFLAGS += $(DEFINES)
-   INCFLAGS = -Iinclude/compat
+   INCFLAGS += -Iinclude/compat
 else ifeq ($(platform), pi)
    TARGET := $(TARGET_NAME)_libretro.so
    fpic := -fPIC
@@ -59,7 +61,7 @@ else ifeq ($(platform), qnx)
    CXX = QCC -Vgcc_ntoarmv7le_cpp
    AR = QCC -Vgcc_ntoarmv7le
    GLES = 1
-   INCFLAGS = -Iinclude/compat
+   INCFLAGS += -Iinclude/compat
    LIBS := -lz
 else ifeq ($(platform), sncps3)
    TARGET := $(TARGET_NAME)_libretro_ps3.a
@@ -67,7 +69,7 @@ else ifeq ($(platform), sncps3)
    CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
    AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
    DEFINES := -D__CELLOS_LV2__
-	INCFLAGS = -Iinclude/miniz -Iinclude/compat
+	INCFLAGS += -Iinclude/compat
 	STATIC_LINKING = 1
 else ifneq (,$(findstring armv,$(platform)))
    CC = gcc
@@ -106,10 +108,11 @@ ifneq (,$(findstring opengl,$(platform)))
    GL_LIB := -lopengl32
 endif
    LIBS := -lz
-   INCFLAGS = -Iinclude/win32
+   INCFLAGS += -Iinclude/win32
 endif
 
 CXXFLAGS += $(INCFLAGS)
+CFLAGS += $(INCFLAGS)
 
 ifeq ($(DEBUG), 1)
    CXXFLAGS += -O0 -g
@@ -117,12 +120,8 @@ else
    CXXFLAGS += -O3
 endif
 
-ifeq ($(INCLUDE_MINIZ), 1)
-MINIZ_OBJ := msvc/deps/miniz/miniz.c
-endif
-
-SOURCES := $(wildcard *.cpp) $(wildcard *.c)
-OBJECTS := $(SOURCES:.cpp=.o) $(MINIZ_OBJ:.c=.o)
+SOURCES := $(wildcard *.cpp) $(wildcard engine/*.cpp) $(wildcard *.c)
+OBJECTS := $(SOURCES:.cpp=.o)
 
 ifeq ($(platform), sncps3)
 CXXFLAGS += $(fpic)
@@ -153,6 +152,9 @@ endif
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 clean:
 	rm -f $(OBJECTS) $(TARGET)
 

jni/Android.mk

@@ -17,8 +17,10 @@ ifeq ($(TARGET_ARCH),mips)
 LOCAL_CFLAGS += -DANDROID_MIPS
 endif
 
-LOCAL_SRC_FILES += $(wildcard ../*.cpp) $(wildcard ../*.c)
-LOCAL_CXXFLAGS += -O2 -Wall -ffast-math -fexceptions -DGLES -DANDROID
+INCFLAGS += -I../ -I../engine
+LOCAL_SRC_FILES += $(wildcard ../*.cpp) $(wildcard ../engine/*.cpp) $(wildcard ../*.c)
+LOCAL_CXXFLAGS += -O2 -Wall -ffast-math -fexceptions -DGLES -DANDROID $(INCFLAGS)
+LOCAL_CFLAGS += $(INCFLAGS)
 LOCAL_LDLIBS += -lz -llog -lGLESv2
 
 include $(BUILD_SHARED_LIBRARY)