update to SDL 2.0.7 #502

pre built libs moved to 3rd-party

Makefile

@@ -5,6 +5,7 @@ BIN_NAME= bin/tic80
 
 3RD_PARTY = ../3rd-party
 DUKTAPE_LIB = $(3RD_PARTY)/duktape-2.2.0/src
+PRE_BUILT = $(3RD_PARTY)/pre-built
 
 RM= rm -f
 
@@ -17,7 +18,7 @@ INCLUDES= \
 	-Iinclude
 
 MINGW_LINKER_FLAGS= \
-	-Llib/mingw \
+	-L$(PRE_BUILT)/mingw \
 	-lmingw32 \
 	-lSDL2main \
 	-lSDL2 \
@@ -41,14 +42,14 @@ LINUX_LIBS= \
 
 LINUX64_LIBS= \
 	$(LINUX_LIBS) \
-	-Llib/linux64
+	-L$(PRE_BUILT)/linux64
 
 LINUX32_LIBS= \
 	$(LINUX_LIBS) \
-	-Llib/linux32
+	-L$(PRE_BUILT)/linux32
 
 LINUX_ARM_LIBS= \
-	-Llib/arm
+	-L$(PRE_BUILT)/arm
 
 LINUX_LINKER_LTO_FLAGS= \
 	-D_GNU_SOURCE \
@@ -80,11 +81,11 @@ EMS_OPT= \
 	-s TOTAL_MEMORY=67108864 \
 	--llvm-lto 1 \
 	--memory-init-file 0 \
-	--pre-js lib/emscripten/prejs.js \
+	--pre-js build/html/prejs.js \
 	-s 'EXTRA_EXPORTED_RUNTIME_METHODS=["writeArrayToMemory"]'
 
 EMS_LINKER_FLAGS= \
-	-Llib/emscripten \
+	-L$(PRE_BUILT)/emscripten \
 	-llua \
 	-lgif \
 	-lz
@@ -96,7 +97,7 @@ MACOSX_OPT= \
 	-D_GNU_SOURCE
 
 MACOSX_LIBS= \
-	-Llib/macos \
+	-L$(PRE_BUILT)/macos \
 	-L/usr/local/lib \
 	-lSDL2 -lm -liconv -lobjc -llua -lz -lgif \
 	-Wl,-framework,CoreAudio \
@@ -283,7 +284,7 @@ TIC80_A = bin/libtic80.a
 TIC80_DLL = bin/tic80.dll
 
 $(TIC80_DLL): $(TIC80_O)
-	$(CC) $(OPT) -shared $(TIC80_O) -Llib/mingw -llua -lgif -Wl,--out-implib,$(TIC80_A) -o $@
+	$(CC) $(OPT) -shared $(TIC80_O) -L$(PRE_BUILT)/mingw -llua -lgif -Wl,--out-implib,$(TIC80_A) -o $@
 
 emscripten:
 	$(EMS_CC) $(SOURCES) $(TIC80_SRC) $(OPT) $(INCLUDES) $(EMS_OPT) $(EMS_LINKER_FLAGS) -o build/html/tic.js
@@ -333,7 +334,7 @@ macosx-pro:
 	$(eval OPT += $(OPT_PRO))
 	make macosx OPT="$(OPT)"
 
-bin/res.o: lib/mingw/res.rc lib/mingw/icon.ico
+bin/res.o: build/mingw/res.rc build/mingw/icon.ico
 	windres $< $@
 
 BIN2TXT= tools/bin2txt/bin2txt

build/android/jni/SDL2/Android.mk

@@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := SDL2
-LOCAL_SRC_FILES := ../../../../lib/android/sdl2/$(TARGET_ARCH_ABI)/libSDL2.so
+LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/sdl2/$(TARGET_ARCH_ABI)/libSDL2.so
 include $(PREBUILT_SHARED_LIBRARY)

build/android/jni/gif/Android.mk

@@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := gif
-LOCAL_SRC_FILES := ../../../../lib/android/gif/$(TARGET_ARCH_ABI)/libgif.so
+LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/gif/$(TARGET_ARCH_ABI)/libgif.so
 include $(PREBUILT_SHARED_LIBRARY)

build/android/jni/lua/Android.mk

@@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := lua
-LOCAL_SRC_FILES := ../../../../lib/android/lua/$(TARGET_ARCH_ABI)/liblua.so
+LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/lua/$(TARGET_ARCH_ABI)/liblua.so
 include $(PREBUILT_SHARED_LIBRARY)

build/android/jni/zlib/Android.mk

@@ -2,5 +2,5 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := z
-LOCAL_SRC_FILES := ../../../../lib/android/zlib/$(TARGET_ARCH_ABI)/libz.so
+LOCAL_SRC_FILES := ../../../../../3rd-party/pre-built/android/zlib/$(TARGET_ARCH_ABI)/libz.so
 include $(PREBUILT_SHARED_LIBRARY)

build/windows/tic/tic.vcxproj

@@ -82,13 +82,13 @@
     <ClCompile Include="..\..\..\src\world.c" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="..\..\..\lib\windows\icon.ico" />
+    <Image Include="icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\lib\windows\resource.h" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\..\lib\windows\tic.rc" />
+    <ResourceCompile Include="tic.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B6ECC66E-26FA-42C2-8F6C-E4338424F38A}</ProjectGuid>

build/windows/tic/tic.vcxproj.filters

@@ -92,17 +92,17 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="..\..\..\lib\windows\icon.ico">
+    <Image Include="icon.ico">
       <Filter>res</Filter>
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\lib\windows\resource.h">
+    <ClInclude Include="resource.h">
       <Filter>res</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\..\lib\windows\tic.rc">
+    <ResourceCompile Include="tic.rc">
       <Filter>res</Filter>
     </ResourceCompile>
   </ItemGroup>