Add IDE switch to CMake options, Add charset.png to dist

src/nostalgia/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)
 
 #setup libraries
 
-if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA")
+if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 	find_package(Qt5Widgets)
 endif()
 
@@ -12,7 +12,7 @@ add_subdirectory(core)
 add_subdirectory(common)
 add_subdirectory(player)
 
-if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA")
+if(NOT NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 	add_subdirectory(tools)
 	add_subdirectory(studio)
 endif()

src/nostalgia/core/CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 2.8.11)
 
-if(WOMBAT_BUILD_TYPE STREQUAL "GBA")
+if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 	enable_language(C ASM)
 	set(
 		CPP
 			gba/gfx.cpp
 			gba/media.cpp
 	)
-elseif(WOMBAT_BUILD_TYPE STREQUAL "Native")
+elseif(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
 	set(CMAKE_INCLUDE_CURRENT_DIR ON)
 	set(CMAKE_AUTOMOC ON)
 
@@ -23,7 +23,7 @@ add_library(
 		core.cpp
 )
 
-if(WOMBAT_BUILD_TYPE STREQUAL "Native")
+if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
 	add_subdirectory(studio)
 endif()
 

src/nostalgia/core/studio/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.11)
 
-if(WOMBAT_BUILD_TYPE STREQUAL "Native")
+if(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
 	add_library(
 		NostalgiaCore-Studio SHARED
 			import_tilesheet_wizard.cpp
@@ -17,5 +17,16 @@ target_link_libraries(
 		OxStd
 )
 
-install(TARGETS NostalgiaCore-Studio
-        LIBRARY DESTINATION lib/nostalgia)
+install(
+	TARGETS
+		NostalgiaCore-Studio
+	LIBRARY DESTINATION
+		lib/nostalgia
+)
+
+install(
+	FILES
+		charset.png
+	DESTINATION
+		share/core
+)

src/nostalgia/player/CMakeLists.txt

@@ -14,7 +14,7 @@ if(COMMAND OBJCOPY_FILE)
 		COMPILER_FLAGS "-mthumb -mthumb-interwork"
 	)
 
-	OBJCOPY_FILE(../../../nostalgia)
+	OBJCOPY_FILE(nostalgia)
 	#PADBIN_FILE(nostalgia)
 endif()
 
@@ -26,6 +26,7 @@ target_link_libraries(
 )
 
 add_custom_target("nostalgia.bin")
+
 install(
 	TARGETS
 		nostalgia
@@ -33,3 +34,12 @@ install(
 		bin
 )
 
+if (NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
+	install(
+		FILES
+			nostalgia.bin
+		DESTINATION
+			bin
+	)
+endif()
+

src/nostalgia/studio/CMakeLists.txt

@@ -27,7 +27,6 @@ target_link_libraries(
 install(
 	FILES
 		nostalgia-studio.json
-		nostalgia_rom.oxfs
 	DESTINATION
 		share
 )