diff --git a/.gitignore b/.gitignore index 76fb03d..f8eee7f 100755 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ ipch/ [Rr]elease*/ Ankh.NoLoad +assets/ deploy.bat \ No newline at end of file diff --git a/assets/.gitignore b/assets/.gitignore deleted file mode 100755 index 639381a..0000000 --- a/assets/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -models/ -textures/ \ No newline at end of file diff --git a/assets/shaders/passthrough.frag.glsl b/assets/shaders/passthrough.frag.glsl deleted file mode 100755 index e69de29..0000000 diff --git a/assets/shaders/passthrough.vert.glsl b/assets/shaders/passthrough.vert.glsl deleted file mode 100755 index e69de29..0000000 diff --git a/deploy.bat b/deploy.bat index 24426a9..ea57a9f 100755 --- a/deploy.bat +++ b/deploy.bat @@ -4,7 +4,8 @@ SET AssetSource=%UserProfile%\Google Drive\Fisk_ Litet Spelprojekt\Assets ECHO Copying assets from %AssetSource% -XCOPY "%AssetSource%" "assets\" /S /Y /Q +RMDIR "assets\" /S /Q +XCOPY "%AssetSource%" "assets\" /E /Y /Q CALL :deploy Debug CALL :deploy Release GOTO:eof @@ -12,7 +13,12 @@ GOTO:eof :deploy ECHO Deploying %~1 SET ConfigPath=bin\%~1 -MKLINK "%ConfigPath%\assets\" "assets\" /J +:: Asset folders +MKLINK "%ConfigPath%\models\" "assets\models" /J +MKLINK "%ConfigPath%\textures\" "assets\textures\" /J +:: Shaders +MKLINK "%ConfigPath%\shaders\" "src\shaders\" /J +:: DLLs MKLINK "%ConfigPath%\glfw3.dll" "libs\glfw-3.0.4\lib\%~1\glfw3.dll" /H MKLINK "%ConfigPath%\OpenAL32.dll" "libs\openal-soft-1.15.1\lib\Win32\%~1\OpenAL32.dll" /H IF %~1==Debug (