From 5ec9fea302a39d6212584fd255a770e5a4be559e Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sun, 14 Apr 2019 03:36:57 +0100 Subject: [PATCH] The build folder is now automatically generated This way, we don't need to tell everyone who uses the enhanced branch that they need to copy res/data_en. It also gives the CMake project a way to bundle everything into a neat little folder. --- .gitignore | 14 ++++++------- CMakeLists.txt | 17 +++++++++++++--- Makefile | 20 ++++++++++++++----- build/fps | 0 {build => res/files_en}/font/cour.ttf | Bin {build => res/files_jp}/font/msgothic.ttc | Bin res/{ => resources}/BITMAP/CREDIT01.bmp | Bin res/{ => resources}/BITMAP/CREDIT02.bmp | Bin res/{ => resources}/BITMAP/CREDIT03.bmp | Bin res/{ => resources}/BITMAP/CREDIT04.bmp | Bin res/{ => resources}/BITMAP/CREDIT05.bmp | Bin res/{ => resources}/BITMAP/CREDIT06.bmp | Bin res/{ => resources}/BITMAP/CREDIT07.bmp | Bin res/{ => resources}/BITMAP/CREDIT08.bmp | Bin res/{ => resources}/BITMAP/CREDIT09.bmp | Bin res/{ => resources}/BITMAP/CREDIT10.bmp | Bin res/{ => resources}/BITMAP/CREDIT11.bmp | Bin res/{ => resources}/BITMAP/CREDIT12.bmp | Bin res/{ => resources}/BITMAP/CREDIT14.bmp | Bin res/{ => resources}/BITMAP/CREDIT15.bmp | Bin res/{ => resources}/BITMAP/CREDIT16.bmp | Bin res/{ => resources}/BITMAP/CREDIT17.bmp | Bin res/{ => resources}/BITMAP/CREDIT18.bmp | Bin res/{ => resources}/BITMAP/PIXEL.bmp | Bin res/{ => resources}/BITMAP/PIXEL_JP.bmp | Bin res/{ => resources}/CURSOR/CURSOR_IKA.bmp | Bin res/{ => resources}/CURSOR/CURSOR_NORMAL.bmp | Bin res/{ => resources}/ICON/0.ico | Bin res/{ => resources}/ICON/ICON.rc | 0 res/{ => resources}/ICON/ICON_MINI.bmp | Bin res/{ => resources}/ICON/ICON_MINI.ico | Bin res/{ => resources}/ORG/ACCESS.org | Bin res/{ => resources}/ORG/ANZEN.org | Bin res/{ => resources}/ORG/BALCONY.org | Bin res/{ => resources}/ORG/BALLOS.org | Bin res/{ => resources}/ORG/BDOWN.org | Bin res/{ => resources}/ORG/CEMETERY.org | Bin res/{ => resources}/ORG/CURLY.org | Bin res/{ => resources}/ORG/DR.org | Bin res/{ => resources}/ORG/ENDING.org | Bin res/{ => resources}/ORG/ESCAPE.org | Bin res/{ => resources}/ORG/FANFALE1.org | Bin res/{ => resources}/ORG/FANFALE2.org | Bin res/{ => resources}/ORG/FANFALE3.org | Bin res/{ => resources}/ORG/FIREEYE.org | Bin res/{ => resources}/ORG/GAMEOVER.org | Bin res/{ => resources}/ORG/GINSUKE.org | Bin res/{ => resources}/ORG/GRAND.org | Bin res/{ => resources}/ORG/GRAVITY.org | Bin res/{ => resources}/ORG/HELL.org | Bin res/{ => resources}/ORG/IRONH.org | Bin res/{ => resources}/ORG/JENKA.org | Bin res/{ => resources}/ORG/JENKA2.org | Bin res/{ => resources}/ORG/KODOU.org | Bin res/{ => resources}/ORG/LASTBT3.org | Bin res/{ => resources}/ORG/LASTBTL.org | Bin res/{ => resources}/ORG/LASTCAVE.org | Bin res/{ => resources}/ORG/MARINE.org | Bin res/{ => resources}/ORG/MAZE.org | Bin res/{ => resources}/ORG/MDOWN2.org | Bin res/{ => resources}/ORG/MURA.org | Bin res/{ => resources}/ORG/OSIDE.org | Bin res/{ => resources}/ORG/PLANT.org | Bin res/{ => resources}/ORG/QUIET.org | Bin res/{ => resources}/ORG/REQUIEM.org | Bin res/{ => resources}/ORG/TOROKO.org | Bin res/{ => resources}/ORG/VIVI.org | Bin res/{ => resources}/ORG/WANPAK2.org | Bin res/{ => resources}/ORG/WANPAKU.org | Bin res/{ => resources}/ORG/WEED.org | Bin res/{ => resources}/ORG/WHITE.org | Bin res/{ => resources}/ORG/XXXX.org | Bin res/{ => resources}/ORG/ZONBIE.org | Bin res/{ => resources}/WAVE/WAVE100 | Bin {res => src/misc}/bin2h.c | 0 75 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 build/fps rename {build => res/files_en}/font/cour.ttf (100%) rename {build => res/files_jp}/font/msgothic.ttc (100%) rename res/{ => resources}/BITMAP/CREDIT01.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT02.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT03.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT04.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT05.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT06.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT07.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT08.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT09.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT10.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT11.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT12.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT14.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT15.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT16.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT17.bmp (100%) rename res/{ => resources}/BITMAP/CREDIT18.bmp (100%) rename res/{ => resources}/BITMAP/PIXEL.bmp (100%) rename res/{ => resources}/BITMAP/PIXEL_JP.bmp (100%) rename res/{ => resources}/CURSOR/CURSOR_IKA.bmp (100%) rename res/{ => resources}/CURSOR/CURSOR_NORMAL.bmp (100%) rename res/{ => resources}/ICON/0.ico (100%) rename res/{ => resources}/ICON/ICON.rc (100%) rename res/{ => resources}/ICON/ICON_MINI.bmp (100%) rename res/{ => resources}/ICON/ICON_MINI.ico (100%) rename res/{ => resources}/ORG/ACCESS.org (100%) rename res/{ => resources}/ORG/ANZEN.org (100%) rename res/{ => resources}/ORG/BALCONY.org (100%) rename res/{ => resources}/ORG/BALLOS.org (100%) rename res/{ => resources}/ORG/BDOWN.org (100%) rename res/{ => resources}/ORG/CEMETERY.org (100%) rename res/{ => resources}/ORG/CURLY.org (100%) rename res/{ => resources}/ORG/DR.org (100%) rename res/{ => resources}/ORG/ENDING.org (100%) rename res/{ => resources}/ORG/ESCAPE.org (100%) rename res/{ => resources}/ORG/FANFALE1.org (100%) rename res/{ => resources}/ORG/FANFALE2.org (100%) rename res/{ => resources}/ORG/FANFALE3.org (100%) rename res/{ => resources}/ORG/FIREEYE.org (100%) rename res/{ => resources}/ORG/GAMEOVER.org (100%) rename res/{ => resources}/ORG/GINSUKE.org (100%) rename res/{ => resources}/ORG/GRAND.org (100%) rename res/{ => resources}/ORG/GRAVITY.org (100%) rename res/{ => resources}/ORG/HELL.org (100%) rename res/{ => resources}/ORG/IRONH.org (100%) rename res/{ => resources}/ORG/JENKA.org (100%) rename res/{ => resources}/ORG/JENKA2.org (100%) rename res/{ => resources}/ORG/KODOU.org (100%) rename res/{ => resources}/ORG/LASTBT3.org (100%) rename res/{ => resources}/ORG/LASTBTL.org (100%) rename res/{ => resources}/ORG/LASTCAVE.org (100%) rename res/{ => resources}/ORG/MARINE.org (100%) rename res/{ => resources}/ORG/MAZE.org (100%) rename res/{ => resources}/ORG/MDOWN2.org (100%) rename res/{ => resources}/ORG/MURA.org (100%) rename res/{ => resources}/ORG/OSIDE.org (100%) rename res/{ => resources}/ORG/PLANT.org (100%) rename res/{ => resources}/ORG/QUIET.org (100%) rename res/{ => resources}/ORG/REQUIEM.org (100%) rename res/{ => resources}/ORG/TOROKO.org (100%) rename res/{ => resources}/ORG/VIVI.org (100%) rename res/{ => resources}/ORG/WANPAK2.org (100%) rename res/{ => resources}/ORG/WANPAKU.org (100%) rename res/{ => resources}/ORG/WEED.org (100%) rename res/{ => resources}/ORG/WHITE.org (100%) rename res/{ => resources}/ORG/XXXX.org (100%) rename res/{ => resources}/ORG/ZONBIE.org (100%) rename res/{ => resources}/WAVE/WAVE100 (100%) rename {res => src/misc}/bin2h.c (100%) diff --git a/.gitignore b/.gitignore index 736bf30d..296697f9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # Misc /obj -/build/data* +/build *.dat *.rec build.7z @@ -13,10 +13,10 @@ build.zip *.exe # MSVC trash -msvc2003/CSE2.ncb -msvc2003/CSE2.suo -msvc2003/Debug -msvc2003/Release -msvc2003/Debug (Japanese) -msvc2003/Release (Japanese) +msvc/msvc2003/CSE2.ncb +msvc/msvc2003/CSE2.suo +msvc/msvc2003/Debug +msvc/msvc2003/Release +msvc/msvc2003/Debug (Japanese) +msvc/msvc2003/Release (Japanese) *.aps diff --git a/CMakeLists.txt b/CMakeLists.txt index 87c4ecb9..8682c3b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,9 +220,11 @@ set(RESOURCES # Handle options if (JAPANESE) + set(FILES_DIR "res/files_jp") list(APPEND RESOURCES "BITMAP/PIXEL_JP.bmp") target_compile_definitions(CSE2 PRIVATE JAPANESE) else() + set(FILES_DIR "res/files_en") list(APPEND RESOURCES "BITMAP/PIXEL.bmp") endif() @@ -240,7 +242,7 @@ endif() # Make some tweaks if we're targetting Windows if (WIN32) - target_sources(CSE2 PRIVATE "res/ICON/ICON.rc") + target_sources(CSE2 PRIVATE "res/resources/ICON/ICON.rc") target_compile_definitions(CSE2 PRIVATE WINDOWS) set_target_properties(CSE2 PROPERTIES WIN32_EXECUTABLE YES) # Disable the console window else() @@ -248,9 +250,9 @@ else() endif() # Magic to convert resources to header files -add_executable(bin2h res/bin2h.c) +add_executable(bin2h src/misc/bin2h.c) foreach(FILENAME IN LISTS RESOURCES) - set(IN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/res") + set(IN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/res/resources") set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Resource") get_filename_component(DIRECTORY "${FILENAME}" DIRECTORY) add_custom_command( @@ -335,3 +337,12 @@ endif() target_include_directories(CSE2 PRIVATE ${SDL2_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}) target_compile_options(CSE2 PRIVATE ${SDL2_CFLAGS_OTHER} ${FREETYPE_CFLAGS_OTHER}) target_link_libraries(CSE2 ${SDL2_LIBRARIES} ${FREETYPE_LIBRARIES}) + +# Set up the output directory +add_custom_command(TARGET CSE2 PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/cavestory") + +set_target_properties(CSE2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}/cavestory") + +add_custom_command(TARGET CSE2 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/${FILES_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/cavestory") diff --git a/Makefile b/Makefile index 84acfa47..3740bb0f 100644 --- a/Makefile +++ b/Makefile @@ -200,9 +200,19 @@ ifeq ($(WINDOWS), 1) OBJECTS += obj/$(FILENAME)/win_icon.o endif -all: build/$(FILENAME) +all: build -build/$(FILENAME): $(OBJECTS) +ifeq ($(JAPANESE), 1) +build: res/files_jp obj/$(FILENAME)/$(FILENAME) +else +build: res/files_en obj/$(FILENAME)/$(FILENAME) +endif + @mkdir -p $(@D) + @echo "Copying files to 'build'" + @cp -r $< $@ + @cp obj/$(FILENAME)/$(FILENAME) $@ + +obj/$(FILENAME)/$(FILENAME): $(OBJECTS) @mkdir -p $(@D) @echo Linking @$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) @@ -218,19 +228,19 @@ obj/$(FILENAME)/Resource.o: src/Resource.cpp $(addprefix src/Resource/, $(addsuf @echo Compiling $< @$(CXX) $(CXXFLAGS) $< -o $@ -c -src/Resource/%.h: res/% obj/bin2h +src/Resource/%.h: res/resources/% obj/bin2h @mkdir -p $(@D) @echo Converting $< @obj/bin2h $< $@ -obj/bin2h: res/bin2h.c +obj/bin2h: src/misc/bin2h.c @mkdir -p $(@D) @echo Compiling $^ @$(CC) -O3 -s -std=c90 $^ -o $@ include $(wildcard $(DEPENDENCIES)) -obj/$(FILENAME)/win_icon.o: res/ICON/ICON.rc res/ICON/0.ico res/ICON/ICON_MINI.ico +obj/$(FILENAME)/win_icon.o: res/resources/ICON/ICON.rc res/resources/ICON/0.ico res/resources/ICON/ICON_MINI.ico @mkdir -p $(@D) @windres $< $@ diff --git a/build/fps b/build/fps deleted file mode 100644 index e69de29b..00000000 diff --git a/build/font/cour.ttf b/res/files_en/font/cour.ttf similarity index 100% rename from build/font/cour.ttf rename to res/files_en/font/cour.ttf diff --git a/build/font/msgothic.ttc b/res/files_jp/font/msgothic.ttc similarity index 100% rename from build/font/msgothic.ttc rename to res/files_jp/font/msgothic.ttc diff --git a/res/BITMAP/CREDIT01.bmp b/res/resources/BITMAP/CREDIT01.bmp similarity index 100% rename from res/BITMAP/CREDIT01.bmp rename to res/resources/BITMAP/CREDIT01.bmp diff --git a/res/BITMAP/CREDIT02.bmp b/res/resources/BITMAP/CREDIT02.bmp similarity index 100% rename from res/BITMAP/CREDIT02.bmp rename to res/resources/BITMAP/CREDIT02.bmp diff --git a/res/BITMAP/CREDIT03.bmp b/res/resources/BITMAP/CREDIT03.bmp similarity index 100% rename from res/BITMAP/CREDIT03.bmp rename to res/resources/BITMAP/CREDIT03.bmp diff --git a/res/BITMAP/CREDIT04.bmp b/res/resources/BITMAP/CREDIT04.bmp similarity index 100% rename from res/BITMAP/CREDIT04.bmp rename to res/resources/BITMAP/CREDIT04.bmp diff --git a/res/BITMAP/CREDIT05.bmp b/res/resources/BITMAP/CREDIT05.bmp similarity index 100% rename from res/BITMAP/CREDIT05.bmp rename to res/resources/BITMAP/CREDIT05.bmp diff --git a/res/BITMAP/CREDIT06.bmp b/res/resources/BITMAP/CREDIT06.bmp similarity index 100% rename from res/BITMAP/CREDIT06.bmp rename to res/resources/BITMAP/CREDIT06.bmp diff --git a/res/BITMAP/CREDIT07.bmp b/res/resources/BITMAP/CREDIT07.bmp similarity index 100% rename from res/BITMAP/CREDIT07.bmp rename to res/resources/BITMAP/CREDIT07.bmp diff --git a/res/BITMAP/CREDIT08.bmp b/res/resources/BITMAP/CREDIT08.bmp similarity index 100% rename from res/BITMAP/CREDIT08.bmp rename to res/resources/BITMAP/CREDIT08.bmp diff --git a/res/BITMAP/CREDIT09.bmp b/res/resources/BITMAP/CREDIT09.bmp similarity index 100% rename from res/BITMAP/CREDIT09.bmp rename to res/resources/BITMAP/CREDIT09.bmp diff --git a/res/BITMAP/CREDIT10.bmp b/res/resources/BITMAP/CREDIT10.bmp similarity index 100% rename from res/BITMAP/CREDIT10.bmp rename to res/resources/BITMAP/CREDIT10.bmp diff --git a/res/BITMAP/CREDIT11.bmp b/res/resources/BITMAP/CREDIT11.bmp similarity index 100% rename from res/BITMAP/CREDIT11.bmp rename to res/resources/BITMAP/CREDIT11.bmp diff --git a/res/BITMAP/CREDIT12.bmp b/res/resources/BITMAP/CREDIT12.bmp similarity index 100% rename from res/BITMAP/CREDIT12.bmp rename to res/resources/BITMAP/CREDIT12.bmp diff --git a/res/BITMAP/CREDIT14.bmp b/res/resources/BITMAP/CREDIT14.bmp similarity index 100% rename from res/BITMAP/CREDIT14.bmp rename to res/resources/BITMAP/CREDIT14.bmp diff --git a/res/BITMAP/CREDIT15.bmp b/res/resources/BITMAP/CREDIT15.bmp similarity index 100% rename from res/BITMAP/CREDIT15.bmp rename to res/resources/BITMAP/CREDIT15.bmp diff --git a/res/BITMAP/CREDIT16.bmp b/res/resources/BITMAP/CREDIT16.bmp similarity index 100% rename from res/BITMAP/CREDIT16.bmp rename to res/resources/BITMAP/CREDIT16.bmp diff --git a/res/BITMAP/CREDIT17.bmp b/res/resources/BITMAP/CREDIT17.bmp similarity index 100% rename from res/BITMAP/CREDIT17.bmp rename to res/resources/BITMAP/CREDIT17.bmp diff --git a/res/BITMAP/CREDIT18.bmp b/res/resources/BITMAP/CREDIT18.bmp similarity index 100% rename from res/BITMAP/CREDIT18.bmp rename to res/resources/BITMAP/CREDIT18.bmp diff --git a/res/BITMAP/PIXEL.bmp b/res/resources/BITMAP/PIXEL.bmp similarity index 100% rename from res/BITMAP/PIXEL.bmp rename to res/resources/BITMAP/PIXEL.bmp diff --git a/res/BITMAP/PIXEL_JP.bmp b/res/resources/BITMAP/PIXEL_JP.bmp similarity index 100% rename from res/BITMAP/PIXEL_JP.bmp rename to res/resources/BITMAP/PIXEL_JP.bmp diff --git a/res/CURSOR/CURSOR_IKA.bmp b/res/resources/CURSOR/CURSOR_IKA.bmp similarity index 100% rename from res/CURSOR/CURSOR_IKA.bmp rename to res/resources/CURSOR/CURSOR_IKA.bmp diff --git a/res/CURSOR/CURSOR_NORMAL.bmp b/res/resources/CURSOR/CURSOR_NORMAL.bmp similarity index 100% rename from res/CURSOR/CURSOR_NORMAL.bmp rename to res/resources/CURSOR/CURSOR_NORMAL.bmp diff --git a/res/ICON/0.ico b/res/resources/ICON/0.ico similarity index 100% rename from res/ICON/0.ico rename to res/resources/ICON/0.ico diff --git a/res/ICON/ICON.rc b/res/resources/ICON/ICON.rc similarity index 100% rename from res/ICON/ICON.rc rename to res/resources/ICON/ICON.rc diff --git a/res/ICON/ICON_MINI.bmp b/res/resources/ICON/ICON_MINI.bmp similarity index 100% rename from res/ICON/ICON_MINI.bmp rename to res/resources/ICON/ICON_MINI.bmp diff --git a/res/ICON/ICON_MINI.ico b/res/resources/ICON/ICON_MINI.ico similarity index 100% rename from res/ICON/ICON_MINI.ico rename to res/resources/ICON/ICON_MINI.ico diff --git a/res/ORG/ACCESS.org b/res/resources/ORG/ACCESS.org similarity index 100% rename from res/ORG/ACCESS.org rename to res/resources/ORG/ACCESS.org diff --git a/res/ORG/ANZEN.org b/res/resources/ORG/ANZEN.org similarity index 100% rename from res/ORG/ANZEN.org rename to res/resources/ORG/ANZEN.org diff --git a/res/ORG/BALCONY.org b/res/resources/ORG/BALCONY.org similarity index 100% rename from res/ORG/BALCONY.org rename to res/resources/ORG/BALCONY.org diff --git a/res/ORG/BALLOS.org b/res/resources/ORG/BALLOS.org similarity index 100% rename from res/ORG/BALLOS.org rename to res/resources/ORG/BALLOS.org diff --git a/res/ORG/BDOWN.org b/res/resources/ORG/BDOWN.org similarity index 100% rename from res/ORG/BDOWN.org rename to res/resources/ORG/BDOWN.org diff --git a/res/ORG/CEMETERY.org b/res/resources/ORG/CEMETERY.org similarity index 100% rename from res/ORG/CEMETERY.org rename to res/resources/ORG/CEMETERY.org diff --git a/res/ORG/CURLY.org b/res/resources/ORG/CURLY.org similarity index 100% rename from res/ORG/CURLY.org rename to res/resources/ORG/CURLY.org diff --git a/res/ORG/DR.org b/res/resources/ORG/DR.org similarity index 100% rename from res/ORG/DR.org rename to res/resources/ORG/DR.org diff --git a/res/ORG/ENDING.org b/res/resources/ORG/ENDING.org similarity index 100% rename from res/ORG/ENDING.org rename to res/resources/ORG/ENDING.org diff --git a/res/ORG/ESCAPE.org b/res/resources/ORG/ESCAPE.org similarity index 100% rename from res/ORG/ESCAPE.org rename to res/resources/ORG/ESCAPE.org diff --git a/res/ORG/FANFALE1.org b/res/resources/ORG/FANFALE1.org similarity index 100% rename from res/ORG/FANFALE1.org rename to res/resources/ORG/FANFALE1.org diff --git a/res/ORG/FANFALE2.org b/res/resources/ORG/FANFALE2.org similarity index 100% rename from res/ORG/FANFALE2.org rename to res/resources/ORG/FANFALE2.org diff --git a/res/ORG/FANFALE3.org b/res/resources/ORG/FANFALE3.org similarity index 100% rename from res/ORG/FANFALE3.org rename to res/resources/ORG/FANFALE3.org diff --git a/res/ORG/FIREEYE.org b/res/resources/ORG/FIREEYE.org similarity index 100% rename from res/ORG/FIREEYE.org rename to res/resources/ORG/FIREEYE.org diff --git a/res/ORG/GAMEOVER.org b/res/resources/ORG/GAMEOVER.org similarity index 100% rename from res/ORG/GAMEOVER.org rename to res/resources/ORG/GAMEOVER.org diff --git a/res/ORG/GINSUKE.org b/res/resources/ORG/GINSUKE.org similarity index 100% rename from res/ORG/GINSUKE.org rename to res/resources/ORG/GINSUKE.org diff --git a/res/ORG/GRAND.org b/res/resources/ORG/GRAND.org similarity index 100% rename from res/ORG/GRAND.org rename to res/resources/ORG/GRAND.org diff --git a/res/ORG/GRAVITY.org b/res/resources/ORG/GRAVITY.org similarity index 100% rename from res/ORG/GRAVITY.org rename to res/resources/ORG/GRAVITY.org diff --git a/res/ORG/HELL.org b/res/resources/ORG/HELL.org similarity index 100% rename from res/ORG/HELL.org rename to res/resources/ORG/HELL.org diff --git a/res/ORG/IRONH.org b/res/resources/ORG/IRONH.org similarity index 100% rename from res/ORG/IRONH.org rename to res/resources/ORG/IRONH.org diff --git a/res/ORG/JENKA.org b/res/resources/ORG/JENKA.org similarity index 100% rename from res/ORG/JENKA.org rename to res/resources/ORG/JENKA.org diff --git a/res/ORG/JENKA2.org b/res/resources/ORG/JENKA2.org similarity index 100% rename from res/ORG/JENKA2.org rename to res/resources/ORG/JENKA2.org diff --git a/res/ORG/KODOU.org b/res/resources/ORG/KODOU.org similarity index 100% rename from res/ORG/KODOU.org rename to res/resources/ORG/KODOU.org diff --git a/res/ORG/LASTBT3.org b/res/resources/ORG/LASTBT3.org similarity index 100% rename from res/ORG/LASTBT3.org rename to res/resources/ORG/LASTBT3.org diff --git a/res/ORG/LASTBTL.org b/res/resources/ORG/LASTBTL.org similarity index 100% rename from res/ORG/LASTBTL.org rename to res/resources/ORG/LASTBTL.org diff --git a/res/ORG/LASTCAVE.org b/res/resources/ORG/LASTCAVE.org similarity index 100% rename from res/ORG/LASTCAVE.org rename to res/resources/ORG/LASTCAVE.org diff --git a/res/ORG/MARINE.org b/res/resources/ORG/MARINE.org similarity index 100% rename from res/ORG/MARINE.org rename to res/resources/ORG/MARINE.org diff --git a/res/ORG/MAZE.org b/res/resources/ORG/MAZE.org similarity index 100% rename from res/ORG/MAZE.org rename to res/resources/ORG/MAZE.org diff --git a/res/ORG/MDOWN2.org b/res/resources/ORG/MDOWN2.org similarity index 100% rename from res/ORG/MDOWN2.org rename to res/resources/ORG/MDOWN2.org diff --git a/res/ORG/MURA.org b/res/resources/ORG/MURA.org similarity index 100% rename from res/ORG/MURA.org rename to res/resources/ORG/MURA.org diff --git a/res/ORG/OSIDE.org b/res/resources/ORG/OSIDE.org similarity index 100% rename from res/ORG/OSIDE.org rename to res/resources/ORG/OSIDE.org diff --git a/res/ORG/PLANT.org b/res/resources/ORG/PLANT.org similarity index 100% rename from res/ORG/PLANT.org rename to res/resources/ORG/PLANT.org diff --git a/res/ORG/QUIET.org b/res/resources/ORG/QUIET.org similarity index 100% rename from res/ORG/QUIET.org rename to res/resources/ORG/QUIET.org diff --git a/res/ORG/REQUIEM.org b/res/resources/ORG/REQUIEM.org similarity index 100% rename from res/ORG/REQUIEM.org rename to res/resources/ORG/REQUIEM.org diff --git a/res/ORG/TOROKO.org b/res/resources/ORG/TOROKO.org similarity index 100% rename from res/ORG/TOROKO.org rename to res/resources/ORG/TOROKO.org diff --git a/res/ORG/VIVI.org b/res/resources/ORG/VIVI.org similarity index 100% rename from res/ORG/VIVI.org rename to res/resources/ORG/VIVI.org diff --git a/res/ORG/WANPAK2.org b/res/resources/ORG/WANPAK2.org similarity index 100% rename from res/ORG/WANPAK2.org rename to res/resources/ORG/WANPAK2.org diff --git a/res/ORG/WANPAKU.org b/res/resources/ORG/WANPAKU.org similarity index 100% rename from res/ORG/WANPAKU.org rename to res/resources/ORG/WANPAKU.org diff --git a/res/ORG/WEED.org b/res/resources/ORG/WEED.org similarity index 100% rename from res/ORG/WEED.org rename to res/resources/ORG/WEED.org diff --git a/res/ORG/WHITE.org b/res/resources/ORG/WHITE.org similarity index 100% rename from res/ORG/WHITE.org rename to res/resources/ORG/WHITE.org diff --git a/res/ORG/XXXX.org b/res/resources/ORG/XXXX.org similarity index 100% rename from res/ORG/XXXX.org rename to res/resources/ORG/XXXX.org diff --git a/res/ORG/ZONBIE.org b/res/resources/ORG/ZONBIE.org similarity index 100% rename from res/ORG/ZONBIE.org rename to res/resources/ORG/ZONBIE.org diff --git a/res/WAVE/WAVE100 b/res/resources/WAVE/WAVE100 similarity index 100% rename from res/WAVE/WAVE100 rename to res/resources/WAVE/WAVE100 diff --git a/res/bin2h.c b/src/misc/bin2h.c similarity index 100% rename from res/bin2h.c rename to src/misc/bin2h.c