Include miniz library; Make all CMake builds PIC.

libretroBuildSystem/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_library(mu-libretro SHARED
 	libretro.c
 	cursors.c
+	miniz.c
 	libretro-common/compat/compat_strl.c
 	libretro-common/compat/compat_posix_string.c
 	libretro-common/compat/fopen_utf8.c
@@ -36,7 +37,7 @@ else()
 	set(MU_LIBRETRO_EXTENSION "")
 endif()
 
-## Target to run RetroArch with the SquirrelJME Core
+## Target to run RetroArch with the Mu Core
 if(DEFINED MU_LIBRETRO_DIR)
 	add_custom_target(RetroArch
 		DEPENDS mu-libretro

libretroBuildSystem/build/Makefile.common

@@ -109,6 +109,7 @@ COREDEFINES += $(EMU_DEFINES)
 
 SOURCES_C := $(CORE_DIR)/libretro.c \
 	$(CORE_DIR)/cursors.c \
+	$(CORE_DIR)/miniz.c \
 	$(EMU_SOURCES_C)
 SOURCES_CXX := $(EMU_SOURCES_CXX)
 SOURCES_ASM := $(EMU_SOURCES_ASM)

libretroBuildSystem/miniz_LICENSE

@@ -0,0 +1,22 @@
+Copyright 2013-2014 RAD Game Tools and Valve Software
+Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/CMakeLists.txt

@@ -13,6 +13,10 @@ add_library(MuCore STATIC
 	tsc2101.c
 	w86l488.c)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCore
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Bring all the sub-modules as needed
 target_link_libraries(MuCore
 	MuCorePxa260Experimental

src/armv5te/CMakeLists.txt

@@ -13,6 +13,10 @@ add_library(MuCoreArmV5TEExperimental STATIC
 	mmu.c
 	thumb_interpreter.cpp)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCoreArmV5TEExperimental
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Currently do not enable the dynamic recompiler
 set(NO_TRANSLATION)
 

src/audio/CMakeLists.txt

@@ -2,6 +2,10 @@
 add_library(MuCoreAudio STATIC
 	blip_buf.c)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCoreAudio
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Includes for the project
 target_include_directories(MuCoreAudio PUBLIC
 	"${PROJECT_BINARY_DIR}"

src/fileLauncher/CMakeLists.txt

@@ -2,6 +2,10 @@
 add_library(MuCoreFileLauncher STATIC
 	launcher.c)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCoreFileLauncher
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Includes for the project
 target_include_directories(MuCoreFileLauncher PUBLIC
 	"${PROJECT_BINARY_DIR}"

src/m68k/CMakeLists.txt

@@ -7,6 +7,10 @@ add_library(MuCoreM68k STATIC
 	m68kopnz.c
 	m68kops.c)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCoreM68k
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Includes for the project
 target_include_directories(MuCoreM68k PUBLIC
 	"${PROJECT_BINARY_DIR}"

src/pxa260/CMakeLists.txt

@@ -16,6 +16,10 @@ add_library(MuCorePxa260Experimental STATIC
 	pxa260Timing.c
 	pxa260Udc.c)
 
+# Make this position independent so it can be linked into shared libraries
+set_property(TARGET MuCorePxa260Experimental
+	PROPERTY POSITION_INDEPENDENT_CODE ON)
+
 # Bring all the sub-modules as needed
 target_link_libraries(MuCorePxa260Experimental
 	MuCoreArmV5TEExperimental)