diff --git a/tools/scaninc/.gitignore b/tools/scaninc/.gitignore deleted file mode 100755 index 94bfbf98..00000000 --- a/tools/scaninc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -scaninc diff --git a/tools/scaninc/Makefile b/tools/scaninc/Makefile deleted file mode 100755 index 1516f159..00000000 --- a/tools/scaninc/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -CXX = g++ - -CXXFLAGS = -Wall -Werror -std=c++11 -O2 - -SRCS = scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp - -HEADERS := scaninc.h asm_file.h c_file.h source_file.h - -.PHONY: all clean - -all: scaninc - @: - -scaninc: $(SRCS) $(HEADERS) - $(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS) - -clean: - $(RM) scaninc scaninc.exe diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt index 5d77a206..875f672f 100644 --- a/tools/src/CMakeLists.txt +++ b/tools/src/CMakeLists.txt @@ -6,3 +6,4 @@ add_subdirectory(gbafix) add_subdirectory(gbagfx) add_subdirectory(mid2agb) add_subdirectory(preproc) +add_subdirectory(scaninc) diff --git a/tools/src/scaninc/CMakeLists.txt b/tools/src/scaninc/CMakeLists.txt new file mode 100644 index 00000000..ec335c3a --- /dev/null +++ b/tools/src/scaninc/CMakeLists.txt @@ -0,0 +1,6 @@ +file(GLOB_RECURSE sources *.cpp) + +add_executable(scaninc ${sources}) +target_include_directories(scaninc PRIVATE .) + +install(TARGETS scaninc RUNTIME DESTINATION bin) diff --git a/tools/scaninc/LICENSE b/tools/src/scaninc/LICENSE similarity index 100% rename from tools/scaninc/LICENSE rename to tools/src/scaninc/LICENSE diff --git a/tools/scaninc/asm_file.cpp b/tools/src/scaninc/asm_file.cpp similarity index 100% rename from tools/scaninc/asm_file.cpp rename to tools/src/scaninc/asm_file.cpp diff --git a/tools/scaninc/asm_file.h b/tools/src/scaninc/asm_file.h similarity index 100% rename from tools/scaninc/asm_file.h rename to tools/src/scaninc/asm_file.h diff --git a/tools/scaninc/c_file.cpp b/tools/src/scaninc/c_file.cpp similarity index 100% rename from tools/scaninc/c_file.cpp rename to tools/src/scaninc/c_file.cpp diff --git a/tools/scaninc/c_file.h b/tools/src/scaninc/c_file.h similarity index 100% rename from tools/scaninc/c_file.h rename to tools/src/scaninc/c_file.h diff --git a/tools/scaninc/scaninc.cpp b/tools/src/scaninc/scaninc.cpp similarity index 100% rename from tools/scaninc/scaninc.cpp rename to tools/src/scaninc/scaninc.cpp diff --git a/tools/scaninc/scaninc.h b/tools/src/scaninc/scaninc.h similarity index 100% rename from tools/scaninc/scaninc.h rename to tools/src/scaninc/scaninc.h diff --git a/tools/scaninc/source_file.cpp b/tools/src/scaninc/source_file.cpp similarity index 100% rename from tools/scaninc/source_file.cpp rename to tools/src/scaninc/source_file.cpp diff --git a/tools/scaninc/source_file.h b/tools/src/scaninc/source_file.h similarity index 100% rename from tools/scaninc/source_file.h rename to tools/src/scaninc/source_file.h