Updated smpeg with the removal of SDL_types.h

libsdl-org · Jul 9, 2013 · e6c5070 · e6c5070
1 parent 19d8538
commit e6c5070
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/external/smpeg2-2.0.0/Android.mk b/external/smpeg2-2.0.0/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := smpeg2
 
-LOCAL_C_INCLUDES := $(NDK_PROJECT_PATH)/jni/SDL/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -D_THREAD_SAFE -DTHREADED_AUDIO -DNOCONTROLS
 
 LOCAL_SRC_FILES := \
@@ -39,4 +39,6 @@ LOCAL_LDLIBS :=
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := SDL2
 
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_C_INCLUDES)
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/external/smpeg2-2.0.0/MPEGring.h b/external/smpeg2-2.0.0/MPEGring.h
@@ -24,7 +24,7 @@
 #ifndef _MPEGRING_H
 #define _MPEGRING_H
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 #include "SDL_thread.h"
 
 class MPEG_ring {

diff --git a/external/smpeg2-2.0.0/MPEGstream.h b/external/smpeg2-2.0.0/MPEGstream.h
@@ -22,7 +22,7 @@
 #ifndef _MPEGSTREAM_H_
 #define _MPEGSTREAM_H_
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 #include "MPEGerror.h"
 #include "MPEGvideo.h"
 #include "MPEGaudio.h"

diff --git a/external/smpeg2-2.0.0/Makefile.am b/external/smpeg2-2.0.0/Makefile.am
@@ -68,6 +68,7 @@ EXTRA_DIST =			\
 	README			\
 	README.SDL_mixer 	\
 	plaympeg.1		\
+	Android.mk		\
 	VisualC.zip		\
 	smpeg2.m4		\
 	smpeg2.spec		\

diff --git a/external/smpeg2-2.0.0/Makefile.in b/external/smpeg2-2.0.0/Makefile.in
@@ -442,6 +442,7 @@ EXTRA_DIST = \
 	README			\
 	README.SDL_mixer 	\
 	plaympeg.1		\
+	Android.mk		\
 	VisualC.zip		\
 	smpeg2.m4		\
 	smpeg2.spec		\