Make NostalgiaStudio library a shared library

CMakeLists.txt

@@ -22,6 +22,9 @@ add_definitions(
 	-Wsign-compare
 )
 
+set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/nostalgia")
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
 	add_definitions(
 		-Werror

src/nostalgia/core/studio/CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)
 
 if(WOMBAT_BUILD_TYPE STREQUAL "Native")
 	add_library(
-		NostalgiaCore-Studio
+		NostalgiaCore-Studio SHARED
-		SHARED
 			import_tilesheet_wizard.cpp
 			plugin.cpp
 	)

src/nostalgia/studio/lib/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 add_library(
-	NostalgiaStudio
+	NostalgiaStudio SHARED
 		json_read.cpp
 		json_write.cpp
 		wizard.cpp
@@ -15,12 +15,8 @@ add_library(
 		project.cpp
 )
 
-set_property(
+install(TARGETS NostalgiaStudio
-	TARGET
+        LIBRARY DESTINATION lib/nostalgia)
-		NostalgiaStudio
-	PROPERTY
-		POSITION_INDEPENDENT_CODE ON
-)
 
 target_link_libraries(
 	NostalgiaStudio

src/nostalgia/tools/lib/CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_AUTOMOC ON)
 
 add_library(
 	NostalgiaTool
+	SHARED
 		tilesetimport.cpp
 )
 
@@ -28,6 +29,6 @@ install(
 install(
 	TARGETS
 		NostalgiaTool
-	LIBRARY DESTINATION lib/ox
+	LIBRARY DESTINATION lib/nostalgia
-	ARCHIVE DESTINATION lib/ox
+	ARCHIVE DESTINATION lib/nostalgia
 )