diff --git a/.gitignore b/.gitignore index 5d1da0b..b6acba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# elf objects +elf_objects/ # profiling results *.spall # logs diff --git a/build_elf_objects.bat b/build_elf_objects.bat new file mode 100644 index 0000000..f216728 --- /dev/null +++ b/build_elf_objects.bat @@ -0,0 +1,29 @@ +@echo off + +@REM what all the compile flags mean: https://learn.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category?view=msvc-170 + + +set OPUSLIB=%~dp0thirdparty\opus\win32\VS2015\x64\Release\opus.lib + +if not exist %OPUSLIB% ( + ECHO ERROR Couldn't find %OPUSLIB% compile opus by opening the visual studio project in win32\VS2015 and building the release setting +) + +setlocal enabledelayedexpansion enableextensions +pushd thirdparty\Chipmunk2D\src + set MUNKSRC= + for %%x in (*.c) do set MUNKSRC=!MUNKSRC! thirdparty\Chipmunk2D\src\%%x +popd + +@REM /DENET_DEBUG=1^ +gcc -c^ + -I"thirdparty" -I"thirdparty\minilzo" -I"thirdparty\enet\include" -I"thirdparty\Chipmunk2D\include\chipmunk" -I"thirdparty\Chipmunk2D\include" -I"thirdparty\opus\include" -I"thirdparty\opus\src"^ + %MUNKSRC% + +mkdir elf_objects +move *.o elf_objects + + @REM main.c gamestate.c server.c debugdraw.c^ + @REM thirdparty\minilzo\minilzo.c^ + @REM %OPUSLIB% + @REM thirdparty\enet\callbacks.c thirdparty\enet\compress.c thirdparty\enet\host.c thirdparty\enet\list.c thirdparty\enet\packet.c thirdparty\enet\peer.c thirdparty\enet\protocol.c thirdparty\enet\win32.c Ws2_32.lib winmm.lib^ diff --git a/flight.rdbg b/flight.rdbg index 8a56a64..de8dda0 100644 Binary files a/flight.rdbg and b/flight.rdbg differ diff --git a/gamestate.c b/gamestate.c index 5c4cec1..04a769e 100644 --- a/gamestate.c +++ b/gamestate.c @@ -2389,7 +2389,7 @@ void create_initial_world(GameState *gs) #undef SUN_POS #else -#if 0 // present the stations +#if 1 // present the stations Log("Creating debug world\n"); // pos, mass, radius