reorganize directory structure, fix minor vfs bugs

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "cotire"]
-	path = cotire
+	path = scripts/cmake-modules/cotire
 	url = https://github.com/sakra/cotire

CMakeLists.txt

@@ -2,6 +2,8 @@ project(taisei C)
 cmake_minimum_required(VERSION 3.2)
 
 set(BUILDSCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
+set(MISC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/misc")
+set(ICONS_DIR "${MISC_DIR}/icons")
 
 list(APPEND CMAKE_MODULE_PATH "${BUILDSCRIPTS_DIR}/cmake-modules")
 list(APPEND CMAKE_MODULE_PATH "${BUILDSCRIPTS_DIR}/cmake-modules/git")
@@ -131,7 +133,7 @@ if(RELATIVE)
     if(APPLE)
         set(RES_DIR "Taisei.app/Contents/Resources")
         set(DATA_DIR "${RES_DIR}/data")
-        install(FILES "OSX-iconset.icns" DESTINATION "${RES_DIR}" RENAME "Taisei.icns")
+        install(FILES "${ICONS_DIR}/taisei.icns" DESTINATION "${RES_DIR}" RENAME "Taisei.icns")
     else()
         set(DATA_DIR "data")
     endif()
@@ -143,7 +145,7 @@ else()
 endif()
 
 if(WIN32)
-    set(DOC_FILES "STORY.txt" "COPYING" "README_installed.txt")
+    set(DOC_FILES "STORY.txt" "COPYING" "misc/README_installed.txt")
     set(DOC_TMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/win32docs")
 
     configure_file(
@@ -159,15 +161,7 @@ endif()
 
 install(FILES "${DOC_SRC_DIR}/STORY.txt" DESTINATION "${DOC_DIR}")
 install(FILES "${DOC_SRC_DIR}/COPYING" DESTINATION "${DOC_DIR}" RENAME "COPYING.txt")
-install(FILES "${DOC_SRC_DIR}/README_installed.txt" DESTINATION "${DOC_DIR}" RENAME "README.txt")
-
-set(GAME_RESOURCES_DIRS
-    "gfx"
-    "sfx"
-    "bgm"
-    "shader"
-    "models"
-)
+install(FILES "${DOC_SRC_DIR}/misc/README_installed.txt" DESTINATION "${DOC_DIR}" RENAME "README.txt")
 
 if(PACKAGE_DATA)
     set(GAME_RESOURCES_ZIP "${CMAKE_CURRENT_BINARY_DIR}/00-taisei.zip")
@@ -196,12 +190,10 @@ if(PACKAGE_DATA)
 
     install(FILES ${GAME_RESOURCES_ZIP} DESTINATION ${DATA_DIR})
 else()
-    foreach(dir ${GAME_RESOURCES_DIRS})
-        install(DIRECTORY ${dir} DESTINATION ${DATA_DIR})
-    endforeach()
+    install(DIRECTORY "resources/" DESTINATION ${DATA_DIR})
 endif()
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gamecontrollerdb/gamecontrollerdb.txt DESTINATION ${DATA_DIR})
+install(FILES ${MISC_DIR}/gamecontrollerdb/gamecontrollerdb.txt DESTINATION ${DATA_DIR})
 
 if(WIN32)
     # XXX: this is supposedly for dynamic-link builds, untested due to MXE being an ass

README.md

@@ -61,7 +61,7 @@ There are a few ways to generate a custom mapping:
 * You can use the [`controllermap`](https://aur.archlinux.org/packages/controllermap) utility, which [comes with SDL source code](https://hg.libsdl.org/SDL/file/68a767ae3a88/test/controllermap.c).
 * If you use Steam, you can configure your controller there. Then you can add Taisei as a non-Steam game; run it from Steam and everything should *just work™*. In case you don't want to do that, find `config/config.vdf` in your Steam installation directory, and look for the `SDL_GamepadBind` variable. It contains a list of SDL mappings separated by line breaks.
 * You can also try the [SDL2 Gamepad Tool by General Arcade](http://www.generalarcade.com/gamepadtool/). This program is free to use, but not open source.
-* Finally, you can try to write a mapping by hand. You will probably have to refer to the SDL documentation. See [gamecontrollerdb/gamecontrollerdb.txt](gamecontrollerdb.txt) for some more examples.
+* Finally, you can try to write a mapping by hand. You will probably have to refer to the SDL documentation. See [misc/gamecontrollerdb/gamecontrollerdb.txt](gamecontrollerdb.txt) for some more examples.
 
 Once you have your mapping, there are two ways to make Taisei use it:
 * Create a file named `gamecontrollerdb.txt` where your config, replays and screenshots are, and put each mapping on a new line.
@@ -90,7 +90,7 @@ Complete music pack consists of 16 bgm\_\*.(ogg/wav/flac) files, where ‘\*’
 ```
 
 If you want to specify stage/boss theme names to be shown during gameplay, you
-may do it by editing the [`bgm/bgm.conf`](bgm/bgm.conf) file.
+may do it by editing the [`resources/bgm/bgm.conf`](bgm/bgm.conf) file.
 
 ## Sound problems (Linux)
 

misc/icons/taisei-replay.png

@@ -0,0 +1 @@
+../../xdg/share/icons/hicolor/256x256/mimetypes/taisei-replay.png

misc/icons/taisei.png

@@ -0,0 +1 @@
+../../xdg/share/icons/hicolor/128x128/apps/taisei.png