Add OxStd as dependency

src/CMakeLists.txt

@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 2.8.8)
 #setup libraries
 
 if(WOMBAT_BUILD_TYPE STREQUAL "Native")
-	find_package(SDL REQUIRED)
-	include_directories(${SDL_INCLUDE_DIR})
-	set(LIBS ${LIBS} ${SDL_LIBRARY})
+	#find_package(SDL REQUIRED)
+	#include_directories(${SDL_INCLUDE_DIR})
+	#set(LIBS ${LIBS} ${SDL_LIBRARY})
 
-	find_package(OpenGL REQUIRED)
-	include_directories(${OPENGL_INCLUDE_DIR})
-	set(LIBS ${LIBS} ${OPENGL_LIBRARY})
+	#find_package(OpenGL REQUIRED)
+	#include_directories(${OPENGL_INCLUDE_DIR})
+	#set(LIBS ${LIBS} ${OPENGL_LIBRARY})
 
 	#find_package(SDL_IMAGE REQUIRED)
 	#include_directories(${SDL_IMAGE_INCLUDE_DIR})
@@ -23,16 +23,11 @@ endif()
 
 find_package(Ox REQUIRED)
 include_directories(${Ox_INCLUDE_DIRS})
-set(LIBS ${LIBS} ${OxFs_LIBRARY})
 
 #project packages
 
 include_directories(".")
 
 add_subdirectory(core)
-set(OBJS ${OBJS} $<TARGET_OBJECTS:NostalgiaCommon>)
-
 add_subdirectory(common)
-set(OBJS ${OBJS} $<TARGET_OBJECTS:NostalgiaCommon>)
-
 add_subdirectory(player)

src/common/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.8)
 
 add_library(
-	NostalgiaCommon OBJECT
+	NostalgiaCommon
 		bounds.cpp
 		point.cpp
 )

src/core/CMakeLists.txt

@@ -10,9 +10,10 @@ if(WOMBAT_BUILD_TYPE STREQUAL "GBA")
 elseif(WOMBAT_BUILD_TYPE STREQUAL "Native")
 endif()
 
-add_library(NostalgiaCore
-	${CPP}
-	core.cpp
+add_library(
+	NostalgiaCore
+		${CPP}
+		core.cpp
 )
 
 install(

src/player/CMakeLists.txt

@@ -17,4 +17,8 @@ if(COMMAND objcopy_file)
 	objcopy_file(nostalgia)
 endif()
 
-target_link_libraries(nostalgia NostalgiaCore)
+target_link_libraries(
+	nostalgia
+		NostalgiaCore
+		${OxStd_LIBRARY}
+)