medfall

commit ed1ec2f1dcadfe26ec9e1722438daa1701b6b76e
parent dba9c64c1416a33cc367425bef0d173db3f209e3
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Fri Mar 17 23:03:41 +0200

@ECHO off in build.bat

Diffstat:
build.bat
 | 
136
++++++++++++++++++++++++++++++++++++++++---------------------------------------
1 file changed, 69 insertions(+), 67 deletions(-)
diff --git a/build.bat b/build.bat
@@ -1,75 +1,77 @@
-@set VC=%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\VC
-@set KIT=%PROGRAMFILES(X86)%\Windows Kits\8.1
-@set DX=%PROGRAMFILES(X86)%\Microsoft DirectX SDK (June 2010)
+@ECHO off
 
-@set INCLUDE=%VC%\include;%KIT%\Include\shared;%DX%\Include;%KIT%\Include\um;%KIT%\Include\winrt
+set VC=%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\VC
+set KIT=%PROGRAMFILES(X86)%\Windows Kits\8.1
+set DX=%PROGRAMFILES(X86)%\Microsoft DirectX SDK (June 2010)
 
-@REM 64bit
-@REM @set LIB=%VC%\lib\amd64;%KIT%\lib\winv6.3\um\x64
-@REM @set PATH=%VC%\bin\amd64\;%PATH%
+set INCLUDE=%VC%\include;%KIT%\Include\shared;%DX%\Include;%KIT%\Include\um;%KIT%\Include\winrt
 
-@REM 32bit
-@set LIB=%VC%\LIB;%VC%\ATLMFC\LIB;%KIT%\lib\winv6.3\um\x86
-@set PATH=%VC%\bin;%PATH%
+REM 64bit
+REM set LIB=%VC%\lib\amd64;%KIT%\lib\winv6.3\um\x64
+REM set PATH=%VC%\bin\amd64\;%PATH%
 
-@set FLAGS=-I include -Z7 -Zo -W4 -Oi -Gm- -GR- -EHa- -nologo -MTd -Od -wd4100 -wd4201 -wd4189 -wd4351 -wd4505 -wd4127 -wd4530 -wd4702 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_USE_MATH_DEFINES -DWIN32_LEAN_AND_MEAN -I .
-@set EXELIBS=glfw.lib user32.lib shell32.lib opengl32.lib gdi32.lib Ws2_32.lib
-@set EXEFLAGS=%EXELIBS% %FLAGS%
-@set COMMONOBJS=log.obj memory_arena.obj work_queue.obj immediate.obj stb_truetype.obj ggformat.obj strlcat.obj strlcpy.obj strtonum.obj renderer.obj text_renderer.obj profiler.obj stats.obj rng\well512.obj
+REM 32bit
+set LIB=%VC%\LIB;%VC%\ATLMFC\LIB;%KIT%\lib\winv6.3\um\x86
+set PATH=%VC%\bin;%PATH%
 
-@cl btt.cc -c %FLAGS%
-@cl heightmap.cc -c %FLAGS%
-@cl ggformat.cc -c %FLAGS%
-@cl gl.cc -c %FLAGS%
-@cl glad.cc -c %FLAGS%
-@cl gpubtt.cc -c %FLAGS%
-@cl http.cc -c %FLAGS%
-@cl hm.cc -c %FLAGS%
-@cl immediate.cc -c %FLAGS%
-@cl log.cc -c %FLAGS%
-@cl memory_arena.cc -c %FLAGS%
-@cl lz4.cc -c %FLAGS%
-@cl lz4hc.cc -c %FLAGS%
-@cl mixer.cc -c %FLAGS%
-@cl profiler.cc -c %FLAGS%
-@cl renderer.cc -c %FLAGS%
-@cl sha2.cc -c %FLAGS% -wd4244
-@cl skybox.cc -c %FLAGS%
-@cl stats.cc -c %FLAGS%
-@cl -Tpstb_image.h -c %FLAGS% -DSTB_IMAGE_IMPLEMENTATION -wd4244
-@cl -Tpstb_truetype.h -c %FLAGS% -DSTB_TRUETYPE_IMPLEMENTATION
-@cl strlcat.cc -c %FLAGS%
-@cl strlcpy.cc -c %FLAGS%
-@cl strtonum.cc -c %FLAGS%
-@cl terrain_manager.cc -c %FLAGS%
-@cl text_renderer.cc -c %FLAGS%
-@cl wave.cc -c %FLAGS%
-@cl win32_audio_output.cc -c %FLAGS%
-@cl work_queue.cc -c %FLAGS%
-@cl rng\well512.cc -c %FLAGS% -Forng\well512.obj
+set FLAGS=-I include -Z7 -Zo -W4 -Oi -Gm- -GR- -EHa- -nologo -MTd -Od -wd4100 -wd4201 -wd4189 -wd4351 -wd4505 -wd4127 -wd4530 -wd4702 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_USE_MATH_DEFINES -DWIN32_LEAN_AND_MEAN -I .
+set EXELIBS=glfw.lib user32.lib shell32.lib opengl32.lib gdi32.lib Ws2_32.lib
+set EXEFLAGS=%EXELIBS% %FLAGS%
+set COMMONOBJS=log.obj memory_arena.obj work_queue.obj immediate.obj stb_truetype.obj ggformat.obj strlcat.obj strlcpy.obj strtonum.obj renderer.obj text_renderer.obj profiler.obj stats.obj rng\well512.obj
 
-@cl libs\imgui\imgui.cc -c %FLAGS% -Folibs\imgui\imgui.obj
-@cl libs\imgui\imgui_draw.cc -c %FLAGS% -Folibs\imgui\imgui_draw.obj
-@cl libs\imgui\imgui_impl_glfw_gl3.cc -c %FLAGS% -Folibs\imgui\imgui_impl_glfw_gl3.obj
-@lib -OUT:imgui.lib libs\imgui\imgui.obj libs\imgui\imgui_draw.obj libs\imgui\imgui_impl_glfw_gl3.obj
+cl btt.cc -c %FLAGS%
+cl heightmap.cc -c %FLAGS%
+cl ggformat.cc -c %FLAGS%
+cl gl.cc -c %FLAGS%
+cl glad.cc -c %FLAGS%
+cl gpubtt.cc -c %FLAGS%
+cl http.cc -c %FLAGS%
+cl hm.cc -c %FLAGS%
+cl immediate.cc -c %FLAGS%
+cl log.cc -c %FLAGS%
+cl memory_arena.cc -c %FLAGS%
+cl lz4.cc -c %FLAGS%
+cl lz4hc.cc -c %FLAGS%
+cl mixer.cc -c %FLAGS%
+cl profiler.cc -c %FLAGS%
+cl renderer.cc -c %FLAGS%
+cl sha2.cc -c %FLAGS% -wd4244
+cl skybox.cc -c %FLAGS%
+cl stats.cc -c %FLAGS%
+cl -Tpstb_image.h -c %FLAGS% -DSTB_IMAGE_IMPLEMENTATION -wd4244
+cl -Tpstb_truetype.h -c %FLAGS% -DSTB_TRUETYPE_IMPLEMENTATION
+cl strlcat.cc -c %FLAGS%
+cl strlcpy.cc -c %FLAGS%
+cl strtonum.cc -c %FLAGS%
+cl terrain_manager.cc -c %FLAGS%
+cl text_renderer.cc -c %FLAGS%
+cl wave.cc -c %FLAGS%
+cl win32_audio_output.cc -c %FLAGS%
+cl work_queue.cc -c %FLAGS%
+cl rng\well512.cc -c %FLAGS% -Forng\well512.obj
 
-@cl libs\glfw\src\context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\context.obj
-@cl libs\glfw\src\init.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\init.obj -wd4152
-@cl libs\glfw\src\input.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\input.obj -wd4152
-@cl libs\glfw\src\monitor.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\monitor.obj -wd4152
-@cl libs\glfw\src\vulkan.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\vulkan.obj
-@cl libs\glfw\src\window.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\window.obj -wd4152
-@cl libs\glfw\src\win32_init.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_init.obj -wd4244
-@cl libs\glfw\src\win32_monitor.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_monitor.obj
-@cl libs\glfw\src\win32_window.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_window.obj -wd4204
-@cl libs\glfw\src\win32_joystick.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_joystick.obj
-@cl libs\glfw\src\win32_time.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_time.obj
-@cl libs\glfw\src\win32_tls.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_tls.obj
-@cl libs\glfw\src\wgl_context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\wgl_context.obj
-@cl libs\glfw\src\egl_context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\egl_context.obj
-@lib -OUT:glfw.lib libs\glfw\src\context.obj libs\glfw\src\init.obj libs\glfw\src\input.obj libs\glfw\src\monitor.obj libs\glfw\src\vulkan.obj libs\glfw\src\window.obj libs\glfw\src\win32_init.obj libs\glfw\src\win32_monitor.obj libs\glfw\src\win32_window.obj libs\glfw\src\win32_joystick.obj libs\glfw\src\win32_time.obj libs\glfw\src\win32_tls.obj libs\glfw\src\wgl_context.obj libs\glfw\src\egl_context.obj
+cl libs\imgui\imgui.cc -c %FLAGS% -Folibs\imgui\imgui.obj
+cl libs\imgui\imgui_draw.cc -c %FLAGS% -Folibs\imgui\imgui_draw.obj
+cl libs\imgui\imgui_impl_glfw_gl3.cc -c %FLAGS% -Folibs\imgui\imgui_impl_glfw_gl3.obj
+lib -OUT:imgui.lib libs\imgui\imgui.obj libs\imgui\imgui_draw.obj libs\imgui\imgui_impl_glfw_gl3.obj
 
-@cl main.cc gl.obj glad.obj hm.obj terrain_manager.obj heightmap.obj btt.obj gpubtt.obj lz4.obj skybox.obj http.obj -DSTATIC_GAME %COMMONOBJS% %EXEFLAGS% -Femedfall.exe
-@cl pp.cc heightmap.obj log.obj stb_image.obj lz4.obj lz4hc.obj memory_arena.obj strlcpy.obj %EXEFLAGS%
-@cl launcher\main.cc log.obj http.obj sha2.obj gl.obj glad.obj work_queue.obj memory_arena.obj strlcpy.obj imgui.lib %EXEFLAGS% -Felauncher.exe
-@cl audio.cc memory_arena.obj log.obj strlcpy.obj win32_audio_output.obj mixer.obj wave.obj Ole32.lib %EXEFLAGS% -Feaudio.exe
+cl libs\glfw\src\context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\context.obj
+cl libs\glfw\src\init.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\init.obj -wd4152
+cl libs\glfw\src\input.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\input.obj -wd4152
+cl libs\glfw\src\monitor.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\monitor.obj -wd4152
+cl libs\glfw\src\vulkan.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\vulkan.obj
+cl libs\glfw\src\window.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\window.obj -wd4152
+cl libs\glfw\src\win32_init.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_init.obj -wd4244
+cl libs\glfw\src\win32_monitor.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_monitor.obj
+cl libs\glfw\src\win32_window.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_window.obj -wd4204
+cl libs\glfw\src\win32_joystick.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_joystick.obj
+cl libs\glfw\src\win32_time.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_time.obj
+cl libs\glfw\src\win32_tls.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\win32_tls.obj
+cl libs\glfw\src\wgl_context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\wgl_context.obj
+cl libs\glfw\src\egl_context.cc -c -D_GLFW_WIN32 -TC %FLAGS% -Folibs\glfw\src\egl_context.obj
+lib -OUT:glfw.lib libs\glfw\src\context.obj libs\glfw\src\init.obj libs\glfw\src\input.obj libs\glfw\src\monitor.obj libs\glfw\src\vulkan.obj libs\glfw\src\window.obj libs\glfw\src\win32_init.obj libs\glfw\src\win32_monitor.obj libs\glfw\src\win32_window.obj libs\glfw\src\win32_joystick.obj libs\glfw\src\win32_time.obj libs\glfw\src\win32_tls.obj libs\glfw\src\wgl_context.obj libs\glfw\src\egl_context.obj
+
+cl main.cc gl.obj glad.obj hm.obj terrain_manager.obj heightmap.obj btt.obj gpubtt.obj lz4.obj skybox.obj http.obj -DSTATIC_GAME %COMMONOBJS% %EXEFLAGS% -Femedfall.exe
+cl pp.cc heightmap.obj log.obj stb_image.obj lz4.obj lz4hc.obj memory_arena.obj strlcpy.obj %EXEFLAGS%
+cl launcher\main.cc log.obj http.obj sha2.obj gl.obj glad.obj work_queue.obj memory_arena.obj strlcpy.obj imgui.lib %EXEFLAGS% -Felauncher.exe
+cl audio.cc memory_arena.obj log.obj strlcpy.obj win32_audio_output.obj mixer.obj wave.obj Ole32.lib %EXEFLAGS% -Feaudio.exe