X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=darkplaces-sdl.dev;h=4ead20d932392605d326f08ceaba9e003bee9d76;hb=6fb644eee19956bee121e1f2430d2b84067dc056;hp=bd3b77cfe6bc974686dcd9832eead7bdad3b7bd7;hpb=e58037b0fc3256a7e53b4e699020573b18e06129;p=xonotic%2Fdarkplaces.git

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index bd3b77cf..4ead20d9 100755
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,15 +1,7 @@
 [Project]
 FileName=darkplaces-sdl.dev
 Name=DarkPlaces
-<<<<<<< .mine
-<<<<<<< .mine
-UnitCount=182
-=======
-UnitCount=175
-=======
 UnitCount=183
->>>>>>> .r9892
->>>>>>> .r9586
 Type=0
 Ver=1
 ObjFiles=
@@ -18,9 +10,9 @@ Libs=C:\Dev-Cpp\SDL\lib
 PrivateResource=darkplaces_private.rc
 ResourceIncludes=
 MakeIncludes=
-Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main_@@__@@_
+Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES_@@__@@_
 CppCompiler=
-Linker=-lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_
+Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_
 IsCpp=0
 Icon=
 ExeOutput=