medfall

commit d2bf993895b959a4948744dc2fb7a8b150303efc
parent 93e5e4a8604234f7b5cda9e2e10d4d4d94eb4cc4
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sat Mar 11 16:15:58 +0200

Windows build fixes

Diffstat:
build.bat
 | 
5
++++-
ggformat.cc
 | 
2
+-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.bat b/build.bat
@@ -15,10 +15,11 @@
 @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 strlcpy.obj renderer.obj text_renderer.obj profiler.obj stats.obj rng\well512.obj
+@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 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%
@@ -37,7 +38,9 @@
 @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%
diff --git a/ggformat.cc b/ggformat.cc
@@ -135,7 +135,7 @@ static const char * parse_format_int( const char * p, const char * one_past_end,
 
 	if( num_len == 0 ) return p;
 
-	*out = strtonum( num, 1, 1024, NULL );
+	*out = int( strtonum( num, 1, 1024, NULL ) );
 	ASSERT( *out != 0 );
 
 	return p + num_len;