medfall

commit ee67aaded95ecff360137005998e305e5ce4409a
parent c85a9b43d527b98717233069d762dbeb34877267
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Jan 22 14:12:32 +0200

Use the repo GLFW on Windows

Diffstat:
build.bat
 | 
20
++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/build.bat b/build.bat
@@ -2,7 +2,7 @@
 @set LIB=C:\Program Files\Microsoft Visual Studio 12.0\VC\LIB;C:\Program Files\Microsoft Visual Studio 12.0\VC\ATLMFC\LIB;C:\Program Files\Windows Kits\8.1\lib\winv6.3\um\x86;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86
 @set PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;%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=glfw3dll.lib user32.lib shell32.lib opengl32.lib gdi32.lib Ws2_32.lib
+@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 strlcpy.obj renderer.obj text_renderer.obj profiler.obj stats.obj rng\well512.obj
 
@@ -36,6 +36,22 @@
 @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 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 glfw3dll.lib imgui.lib Ws2_32.lib -Felauncher.exe %FLAGS%
+@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