Build: Stored compiled assets in a separate achive, and move shaders to the compiled asset archive

.gitignore

@@ -12,18 +12,18 @@ Data/Binaries
 Data/Settings.asset
 Data/.version
 Data/*
-!Data/ShaderDependencies.json
+!Data/.reqversion
 !Data/EmptyCSScriptText.txt
 !Data/EmptyShaderText.txt
-!Data/Layout.asset
-!Data/Shaders
-!Data/Shaders/Includes/
 !Data/Raw/
 Data/Raw/*
+!Data/Raw/ShaderDependencies.json
 !Data/Raw/DataList.json
 !Data/Raw/GUISkin.json
 !Data/Raw/Shaders/
 !Data/Raw/Shaders/Includes/
+!Data/Raw/.reqversion
+!Data/Raw/DataPackageContents.txt
 Documentation/html
 /Build
 *.aps

CMakeLists.txt

@@ -28,7 +28,7 @@ add_subdirectory(${BSF_SOURCE_DIR})
 
 set (BS_PREBUILT_DEPENDENCIES_VERSION 24)
 set (BS_SRC_DEPENDENCIES_VERSION 15)
-set (BS_BUILTIN_ASSETS_VERSION 10)
+set (BS_BUILTIN_ASSETS_VERSION 11)
 
 # Options
 set(GENERATE_SCRIPT_BINDINGS OFF CACHE BOOL "If true, script binding files will be generated. Script bindings are required for the project to build properly, however they take a while to generate. If you are sure the script bindings are up to date, you can turn off their generation (temporarily) to speed up the build.")
@@ -38,12 +38,17 @@ set(GENERATE_SCRIPT_BINDINGS OFF CACHE BOOL "If true, script binding files will
 check_and_update_binary_deps(Banshee ${PROJECT_SOURCE_DIR}/Dependencies/ ${BS_PREBUILT_DEPENDENCIES_VERSION})
 
 ## Check data dependencies
-check_and_update_builtin_assets(Banshee ${PROJECT_SOURCE_DIR}/Data Data ${BS_BUILTIN_ASSETS_VERSION} NO)
+check_and_update_builtin_assets(Banshee ${PROJECT_SOURCE_DIR}/Data/Raw Raw ${BS_BUILTIN_ASSETS_VERSION} NO)
 		
 ## Import built-in assets
 if(${BUILD_ASSETS})
 	run_import_tool(Banshee ${PROJECT_SOURCE_DIR} "--editor")
 endif()
+
+## Fetch built-in assets
+set(BANSHEE_COMPILED_ASSETS_VERSION_FILE ${PROJECT_SOURCE_DIR}/Data/.reqversion)
+file (STRINGS ${BANSHEE_COMPILED_ASSETS_VERSION_FILE} BANSHEE_COMPILED_ASSETS_VERSION)
+check_and_update_builtin_assets(BansheeCompiled ${PROJECT_SOURCE_DIR}/Data Data ${BANSHEE_COMPILED_ASSETS_VERSION} NO)
 		
 # Generate script bindings
 include(${BSF_SOURCE_DIR}/CMake/GenerateScriptBindings.cmake)

Data/.reqversion

@@ -0,0 +1 @@
+1

Data/Raw/DataList.json

@@ -22,7 +22,7 @@
 	"SplashScreen": {
 		"Path": "SplashScreen.png"
 	},
-    "Icons": [
+    "SpriteIcons": [
         {
             "Path": "AnimationAddEventIcon.png",
             "SpriteUUID": "7dc84c5f-9119-4402-9e6f-50b876f80c02",

Data/Raw/DataPackageContents.txt

@@ -0,0 +1,13 @@
+Data/Icons
+Data/Shaders
+Data/Skin
+Data/.version
+Data/arial.ttf.asset
+Data/arial.ttf_8_texpage_0.asset
+Data/arialAA.ttf.asset
+Data/arialAA.ttf_16_texpage_0.asset
+Data/GUISkin.asset
+Data/Layout.asset
+Data/SplashScreen.png.asset
+Data/Timestamp.asset
+Data/ResourceManifest.asset

Source/bsf

@@ -1 +1 @@
-Subproject commit 794d8c7ed852e62853dcd8ad87be306caedbfcb6
+Subproject commit 0c6a549dcb437e3eb972174b7f173051d5edc798