Subversion Repositories eduke32

Rev

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

Rev 4989 Rev 5000
Line 24... Line 24...
24
LOCAL_CFLAGS += -W  -Werror-implicit-function-declaration -Wpointer-arith -Wextra  -Wno-unused-result  -Wno-char-subscripts -Wno-strict-overflow -Wno-attributes -Wno-write-strings
24
LOCAL_CFLAGS += -W  -Werror-implicit-function-declaration -Wpointer-arith -Wextra  -Wno-unused-result  -Wno-char-subscripts -Wno-strict-overflow -Wno-attributes -Wno-write-strings
25
LOCAL_CPPFLAGS := -std=gnu++03
25
LOCAL_CPPFLAGS := -std=gnu++03
26
26
27
#-DUSE_LIBPNG
27
#-DUSE_LIBPNG
28
28
29
LOCAL_CFLAGS += -DHAVE_SDL -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1  -DUSE_OPENGL -DNETCODE_DISABLE
29
LOCAL_CFLAGS += -DHAVE_SDL -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1  -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX
30
30
31
#LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
31
#LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
32
32
33
LOCAL_LDFLAGS := -fuse-ld=bfd
33
LOCAL_LDFLAGS := -fuse-ld=bfd
34
LOCAL_ARM_NEON = true
34
LOCAL_ARM_NEON = true
35
35
36
LOCAL_C_INCLUDES :=  $(LOCAL_PATH)/source $(LOCAL_PATH)/source/jmact $(LOCAL_PATH)/source/jaudiolib/include $(LOCAL_PATH)/source/enet/include  $(LOCAL_PATH)/build/include
36
LOCAL_C_INCLUDES :=  $(LOCAL_PATH)/source $(LOCAL_PATH)/source/jmact $(LOCAL_PATH)/source/jaudiolib/include $(LOCAL_PATH)/source/enet/include  $(LOCAL_PATH)/build/include
37
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
37
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 $(TOP_DIR)/Libraries/libvpx/include
38
38
39
ANDROID_SRC = \
39
ANDROID_SRC = \
40
	source/android/android-jni.cpp \
40
	source/android/android-jni.cpp \
41
	source/android/in_android.c \
41
	source/android/in_android.c \
42
        build/src/glbuild_android.c \
42
        build/src/glbuild_android.c \
Line 81... Line 81...
81
81
82
GAME_SRC=source/game.c \
82
GAME_SRC=source/game.c \
83
	source/actors.c \
83
	source/actors.c \
84
	source/anim.c \
84
	source/anim.c \
85
	source/animsounds.c \
85
	source/animsounds.c \
-
 
86
        source/animvpx.c \
86
	source/common.c \
87
	source/common.c \
87
	source/config.c \
88
	source/config.c \
88
	source/demo.c \
89
	source/demo.c \
89
	source/gamedef.c \
90
	source/gamedef.c \
90
	source/gameexec.c \
91
	source/gameexec.c \
Line 132... Line 133...
132
 
133
 
133
LOCAL_SRC_FILES = $(ANDROID_SRC) $(JAUDIO_SRC) $(JMACT_SRC) $(GAME_SRC) $(BUILD_SRC)  
134
LOCAL_SRC_FILES = $(ANDROID_SRC) $(JAUDIO_SRC) $(JMACT_SRC) $(GAME_SRC) $(BUILD_SRC)  
134
135
135
LOCAL_LDLIBS :=  -lGLESv1_CM -lEGL -ldl -llog -lOpenSLES -lz -L$(TOP_DIR)/openssl/libs/ 
136
LOCAL_LDLIBS :=  -lGLESv1_CM -lEGL -ldl -llog -lOpenSLES -lz -L$(TOP_DIR)/openssl/libs/ 
136
LOCAL_STATIC_LIBRARIES :=   libpng crypto  
137
LOCAL_STATIC_LIBRARIES :=   libpng crypto 
137
LOCAL_SHARED_LIBRARIES := touchcontrols ogg vorbis SDL2 SDL2_mixer 
138
LOCAL_SHARED_LIBRARIES := touchcontrols ogg vorbis SDL2 SDL2_mixer libvpx
138
# SDL2_image
139
# SDL2_image
139
140
140
ifeq ($(GP_LIC),1)
141
ifeq ($(GP_LIC),1)
141
LOCAL_STATIC_LIBRARIES +=  s-setup
142
LOCAL_STATIC_LIBRARIES +=  s-setup
142
LOCAL_CFLAGS += -DGP_LIC
143
LOCAL_CFLAGS += -DGP_LIC