Point CMake to using the subtree copy of Ox

src/CMakeLists.txt

@@ -6,10 +6,6 @@ if(NOT WOMBAT_BUILD_TYPE STREQUAL "GBA")
 	find_package(Qt5Widgets)
 endif()
 
-find_package(Ox REQUIRED)
-include_directories(${Ox_INCLUDE_DIRS})
-
-
 #project packages
 
 include_directories(".")

src/core/gba/gba.hpp

@@ -21,7 +21,7 @@ typedef uint16_t Pallete[256];
 typedef Tile  CharBlock[512];
 typedef Tile8 CharBlock8[256];
 
-struct __attribute__((aligned(4))) GbaImageData {
+struct __attribute__((packed)) GbaImageData {
 	Pallete pal;
 	uint16_t tileCount;
 	uint8_t bpp;

src/player/CMakeLists.txt

@@ -21,6 +21,6 @@ endif()
 target_link_libraries(
 	nostalgia
 		NostalgiaCore
-		${OxStd_LIBRARY}
-		${OxFS_LIBRARY}
+		OxStd
+		OxFS
 )

src/studio/CMakeLists.txt

@@ -15,9 +15,9 @@ target_link_libraries(
 	nostalgia-studio
 		Qt5::Core
 		Qt5::Widgets
-		${OxClArgs_LIBRARY}
-		${OxFS_LIBRARY}
-		${OxStd_LIBRARY}
+		OxClArgs
+		OxFS
+		OxStd
 		NostalgiaCommon
 		NostalgiaCore
 		NostalgiaStudioStatic

src/studio/lib/CMakeLists.txt

@@ -22,8 +22,8 @@ target_link_libraries(
 	NostalgiaStudioStatic
 		Qt5::Core
 		Qt5::Widgets
-		${OxFS_LIBRARY}
-		${OxStd_LIBRARY}
+		OxFS
+		OxStd
 )
 
 add_library(
@@ -36,8 +36,8 @@ target_link_libraries(
 		Qt5::Core
 		Qt5::Widgets
 		NostalgiaStudioStatic
-		${OxFS_LIBRARY}
-		${OxStd_LIBRARY}
+		OxFS
+		OxStd
 )
 
 install(

src/tools/CMakeLists.txt

@@ -10,9 +10,9 @@ add_executable(nost-pack pack.cpp)
 target_link_libraries(
 	nost-pack
 		Qt5::Widgets
-		${OxClArgs_LIBRARY}
-		${OxFS_LIBRARY}
-		${OxStd_LIBRARY}
+		OxClArgs
+		OxFS
+		OxStd
 		NostalgiaCommon
 		NostalgiaCore
 )