X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=darkplaces-sdl.dev;h=4ead20d932392605d326f08ceaba9e003bee9d76;hp=78227ada02aef8a79ad10ec3790908ef9d749ee7;hb=35b7d263c31d6576b488a3df4c1b06ad5acb3ecd;hpb=b3030be8791663d54406b82fd5d307c948bd8bdd

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index 78227ada..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=181
->>>>>>> .r9892
->>>>>>> .r9586
+UnitCount=183
 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=
@@ -1786,7 +1778,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit182]
-FileName=intoverflow.h
+FileName=bih.h
 CompileCpp=0
 Folder=Header Files
 Compile=1
@@ -1975,3 +1967,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit183]
+FileName=bih.c
+CompileCpp=0
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+