medfall

commit 3762958cd02199dacea8e445c430df7d4a955bd3
parent f4904c87c179b877ced4fd2e8a94f93c70b22b00
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Fri Oct 14 19:46:20 +0300

Update build scripts for strlcpy

Diffstat:
Makefile
 | 
2
+-
build.bat
 | 
7
++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ all: $(BINS) $(MODULES) test_lockfree
 
 # Binary dependencies
 medfall: main.o gl.o log.o memory_arena.o glad.o
-pp: pp.o log.o memory_arena.o stb_image.o lz4.o lz4hc.o
+pp: pp.o log.o memory_arena.o stb_image.o lz4.o lz4hc.o strlcpy.o
 sound: audio.o mixer.o log.o memory_arena.o wave.o platform_audio_output.o
 srv: server/main.o rng/well512.o
 
diff --git a/build.bat b/build.bat
@@ -5,6 +5,7 @@ set FLAGS=-I include -Z7 -Zo -W4 -Oi -Gm- -GR- -EHa- -nologo -MTd -O1 -wd4100 -w
 REM -DGLAD_GLAPI_EXPORT
 set EXELIBS=glfw3dll.lib user32.lib shell32.lib opengl32.lib gdi32.lib
 set EXEFLAGS=%EXELIBS% %FLAGS%
+set COMMONOBJS=log.obj memory_arena.obj work_queue.obj immediate.obj benchmark.obj stb_truetype.obj glsl.obj strlcpy.obj
 
 cl benchmark.cc -c %FLAGS%
 cl btt.cc -c %FLAGS%
@@ -28,10 +29,10 @@ cl terrain_manager.cc -c %FLAGS%
 cl work_queue.cc -c %FLAGS%
 
 REM -DGLAD_GLAPI_EXPORT
-cl -LD %FLAGS% mod_btt.obj btt.obj gpubtt.obj glsl.obj memory_arena.obj glad.obj heightmap.obj skybox.obj log.obj immediate.obj stb_image.obj -Femod_btt.dll -link -EXPORT:game_init -EXPORT:game_frame
-cl -LD %FLAGS% hm.obj terrain_manager.obj heightmap.obj btt.obj gpubtt.obj lz4.obj skybox.obj work_queue.obj memory_arena.obj log.obj immediate.obj glsl.obj stb_truetype.obj glad.obj glfw3dll.lib -Fehm.dll -link -EXPORT:game_init -EXPORT:game_frame
+cl -LD %FLAGS% mod_btt.obj btt.obj gpubtt.obj glad.obj heightmap.obj skybox.obj stb_image.obj %COMMONOBJS% -Femod_btt.dll -link -EXPORT:game_init -EXPORT:game_frame
+cl -LD %FLAGS% hm.obj terrain_manager.obj heightmap.obj btt.obj gpubtt.obj lz4.obj skybox.obj glad.obj %COMMONOBJS% glfw3dll.lib -Fehm.dll -link -EXPORT:game_init -EXPORT:game_frame
 
 cl main.cc gl.obj glad.obj log.obj memory_arena.obj %EXEFLAGS% -Femedfall.exe
-cl pp.cc stb_image.obj lz4.obj lz4hc.obj %EXEFLAGS%
+cl pp.cc stb_image.obj lz4.obj lz4hc.obj memory_arena.obj strlcpy.obj %EXEFLAGS%
 
 pause