Tools completly moved outside of niotso now

Tools/CMakeLists.txt

@@ -1,4 +1,6 @@
-add_subdirectory(far-extract)
+#archive
+add_subdirectory(archive)
+add_subdirectory(format)
 add_subdirectory(vitaboy-parse)
 
 #add_subdirectory(FARDive)

Tools/archive/CMakeLists.txt

@@ -0,0 +1,3 @@
+#archive
+add_subdirectory(far-extract)
+add_subdirectory(iff-export)

Tools/archive/far-extract/CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 2.6...3.29)
 project(far-extract)
 
-include_directories(${format_SOURCE_DIR})
+include_directories(${far_SOURCE_DIR})
 add_executable(farextract farextract.c)
 target_link_libraries(farextract far)
 
-set_target_properties(farextract PROPERTIES FOLDER tools)
+set_target_properties(farextract PROPERTIES FOLDER tools/archive)

Tools/archive/far-extract/farextract.c

@@ -23,7 +23,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include "far/far.h"
+#include <far.h>
 
 #ifndef read_uint32
  #define read_uint32(x) (unsigned)(((x)[0]<<(8*0)) | ((x)[1]<<(8*1)) | ((x)[2]<<(8*2)) | ((x)[3]<<(8*3)))

Tools/archive/iff-export/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.6...3.29)
+project(iff-export)
+
+include_directories(${iff_SOURCE_DIR})
+add_executable(iffexport iffexport.c)
+target_link_libraries(iffexport iff)
+
+set_target_properties(iffexport PROPERTIES FOLDER tools/archive)

Tools/format/CMakeLists.txt

@@ -0,0 +1,3 @@
+#format
+add_subdirectory(xa-decode)
+add_subdirectory(utk-decode)

Tools/format/utk-decode/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.6...3.29)
+project(utk-decode)
+
+include_directories(${format_SOURCE_DIR})
+add_executable(utk-decode utkdecode.c)
+target_link_libraries(utk-decode format)
+
+set_target_properties(utk-decode PROPERTIES FOLDER tools/format)

Tools/format/utk-decode/utkdecode.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <time.h>
-#include "read_utk.h"
+#include <utk/read_utk.h>
 
 #ifndef write_int32
  #define write_uint32(dest, src) do {\

Tools/format/xa-decode/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 2.6...3.29)
+project(xa-decode)
+
+include_directories(${format_SOURCE_DIR})
+add_executable(xa-decode xadecode.c)
+target_link_libraries(xa-decode format)
+
+set_target_properties(xa-decode PROPERTIES FOLDER tools/format)

Tools/format/xa-decode/xadecode.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <time.h>
-#include "read_xa.h"
+#include <xa/read_xa.h>
 
 #ifndef write_int32
  #define write_uint32(dest, src) do {\

Tools/iff-export/CMakeLists.txt

@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 2.6...3.29)
-project(iff-export)
-
-add_executable(iffexport iffexport.c)
-target_link_libraries(iffexport iff)

Tools/utk-decode/CMakeLists.txt

@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6...3.29)
-project(utk)
-
-set(UTK_SOURCES
-    read_utk.c
-    utkdecode.c
-)
-
-add_executable(utkdecode ${UTK_SOURCES})

Tools/vitaboy-parse/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6...3.29)
 project(vitaboy-parse)
 
-include_directories(${vitaboy_SOURCE_DIR} ${filehandler_SOURCE_DIR})
+include_directories(${libvitaboy_SOURCE_DIR} ${filehandler_SOURCE_DIR})
 
 add_executable(vbparse vbparse.cpp)
 target_link_libraries(vbparse libvitaboy FileHandler)

Tools/vitaboy-parse/vbparse.cpp

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <FileHandler.hpp>
-#include "libvitaboy.hpp"
+#include <libvitaboy.hpp>
 
 enum VBFileType {
     VBFILE_ANIM,

Tools/xa-decode/CMakeLists.txt

@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6...3.29)
-project(xa)
-
-set(XA_SOURCES
-    read_xa.c
-    xadecode.c
-)
-
-add_executable(xadecode ${XA_SOURCES})