Subversion Repositories eduke32

Rev

Rev 4440 | Rev 4694 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4440 Rev 4693
Line 21... Line 21...
21
21
22
LOCAL_MODULE    := duke
22
LOCAL_MODULE    := duke
23
23
24
# -O2  -fvisibility=hidden
24
# -O2  -fvisibility=hidden
25
25
26
LOCAL_CFLAGS :=  -fvisibility=hidden -fPIC -Wimplicit -Wdeclaration-after-statement -O2 -funswitch-loops -fomit-frame-pointer -DNDEBUG -DUSING_LTO -flto -fno-stack-protector   -W  -Werror-implicit-function-declaration -Wpointer-arith -Wextra  -funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS -D_FORTIFY_SOURCE=2 -fjump-tables -Wno-unused-result  -Wno-char-subscripts -DUSE_LIBPNG   -pthread -DHAVE_INTTYPES  -D_GNU_SOURCE=1 -D_REENTRANT -DRENDERTYPESDL=1 -Wno-strict-overflow -DUSE_OPENGL  -Wno-attributes
26
LOCAL_CFLAGS :=  -fvisibility=hidden -fPIC -Wimplicit -Wdeclaration-after-statement -O2 -funswitch-loops -fomit-frame-pointer -DNDEBUG -DUSING_LTO -flto -fno-stack-protector   -W  -Werror-implicit-function-declaration -Wpointer-arith -Wextra  -funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS -D_FORTIFY_SOURCE=2 -fjump-tables -Wno-unused-result  -Wno-char-subscripts    -pthread -DHAVE_INTTYPES  -D_GNU_SOURCE=1 -D_REENTRANT -DRENDERTYPESDL=1 -Wno-strict-overflow -DUSE_OPENGL  -Wno-attributes
27
27
28
#Needed my jaudiolib
28
#-DUSE_LIBPNG
29
LOCAL_CFLAGS += -DHAVE_SDL
-
 
30
29
31
LOCAL_LDLIBS += -lGLESv1_CM -lEGL
30
LOCAL_CFLAGS += -DHAVE_SDL -DHAVE_VORBIS -DDROIDMENU
32
31
-
 
32
#LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
-
 
33
33
LOCAL_LDLIBS += -llog
34
LOCAL_ARM_NEON = true
34
35
35
LOCAL_CFLAGS += -march=armv7-a -mfloat-abi=softfp
-
 
36
LOCAL_LDLIBS += -Wl,--fix-cortex-a8
36
LOCAL_LDLIBS += -lGLESv1_CM -lEGL
37
37
-
 
38
LOCAL_LDLIBS += -llog
38
39
39
LOCAL_C_INCLUDES :=  $(LOCAL_PATH)/source $(LOCAL_PATH)/source/jmact $(LOCAL_PATH)/source/jaudiolib/include $(LOCAL_PATH)/source/enet/include  $(LOCAL_PATH)/build/include
40
LOCAL_C_INCLUDES :=  $(LOCAL_PATH)/source $(LOCAL_PATH)/source/jmact $(LOCAL_PATH)/source/jaudiolib/include $(LOCAL_PATH)/source/enet/include  $(LOCAL_PATH)/build/include
40
41
41
LOCAL_C_INCLUDES +=    $(TOP_DIR)/  $(TOP_DIR)/Libraries/ $(TOP_DIR)/Libraries/SDL2/include  $(TOP_DIR)/Libraries/SDL2_mixer/include $(TOP_DIR)/Libraries/libpng/include   $(TOP_DIR)/Libraries/TinyXML/include $(TOP_DIR)/TouchControls 
42
LOCAL_C_INCLUDES +=    $(TOP_DIR)/ $(TOP_DIR)/Libraries/liboggvorbis/include $(TOP_DIR)/Libraries/ $(TOP_DIR)/Libraries/SDL2/include  $(TOP_DIR)/Libraries/SDL2_mixer/include $(TOP_DIR)/Libraries/libpng/include   $(TOP_DIR)/Libraries/TinyXML/include $(TOP_DIR)/TouchControls 
42
43
43
ANDROID_SRC = \
44
ANDROID_SRC = \
44
	source/android/android-jni.cpp \
45
	source/android/android-jni.cpp \
45
	source/android/in_android.c
46
	source/android/in_android.c
46
47
Line 62... Line 63...
62
	build/src/lz4.c \
63
	build/src/lz4.c \
63
	build/src/osd.c \
64
	build/src/osd.c \
64
	build/src/pragmas.c \
65
	build/src/pragmas.c \
65
	build/src/scriptfile.c \
66
	build/src/scriptfile.c \
66
	build/src/mutex.c \
67
	build/src/mutex.c \
67
        build/src/xxhash.c
68
    build/src/xxhash.c \
-
 
69
    build/src/mmulti_null.c \
-
 
70
    build/src/voxmodel.c \
-
 
71
    build/src/common.c \
-
 
72
    
68
73
69
GL_SRC = \
74
GL_SRC = \
70
 	build/src/mdsprite.c \
75
 	build/src/mdsprite.c \
71
 	build/src/glbuild_android.c \
76
 	build/src/glbuild_android.c \
72
77
Line 105... Line 110...
105
	source/osdcmds.c \
110
	source/osdcmds.c \
106
	source/grpscan.c \
111
	source/grpscan.c \
107
	source/sounds.c \
112
	source/sounds.c \
108
	source/soundsdyn.c \
113
	source/soundsdyn.c \
109
  	source/sdlmusic.c \
114
  	source/sdlmusic.c \
-
 
115
  	source/rev.c 
110
 
116
 
111
 JAUDIO_SRC=source/jaudiolib/src/drivers.c \
117
 JAUDIO_SRC=source/jaudiolib/src/drivers.c \
112
	source/jaudiolib/src//fx_man.c \
118
	source/jaudiolib/src//fx_man.c \
113
	source/jaudiolib/src//multivoc.c \
119
	source/jaudiolib/src//multivoc.c \
114
	source/jaudiolib/src//mix.c \
120
	source/jaudiolib/src//mix.c \
Line 132... Line 138...
132
    source/enet/src/unix.c
138
    source/enet/src/unix.c
133
 
139
 
134
LOCAL_SRC_FILES = $(ANDROID_SRC) $(ENET_SRC) $(JAUDIO_SRC) $(JMACT_SRC) $(GAME_SRC) $(BUILD_SRC)  $(GL_SRC) $(SDL_SRC)  
140
LOCAL_SRC_FILES = $(ANDROID_SRC) $(ENET_SRC) $(JAUDIO_SRC) $(JMACT_SRC) $(GAME_SRC) $(BUILD_SRC)  $(GL_SRC) $(SDL_SRC)  
135
141
136
142
137
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lOpenSLES -lz
143
LOCAL_LDLIBS :=  -lGLESv1_CM -lEGL -ldl -llog -lOpenSLES -lz -L$(TOP_DIR)/openssl/libs/ -lcrypto
138
LOCAL_STATIC_LIBRARIES :=  nanogl  SDL2_net libjpeg libpng
144
LOCAL_STATIC_LIBRARIES :=  nanogl  SDL2_net libjpeg libpng
139
LOCAL_SHARED_LIBRARIES := touchcontrols openal SDL2 SDL2_mixer SDL2_image
145
LOCAL_SHARED_LIBRARIES := touchcontrols openal ogg vorbis SDL2 SDL2_mixer SDL2_image
140
146
141
ifeq ($(GP_LIC),1)
147
ifeq ($(GP_LIC),1)
142
LOCAL_STATIC_LIBRARIES +=  s-setup
148
LOCAL_STATIC_LIBRARIES +=  s-setup
143
LOCAL_CFLAGS += -DGP_LIC
149
LOCAL_CFLAGS += -DGP_LIC
144
endif
150
endif