APPEND forced args, not PREPEND, as earlier arguments win in most DP options.

[xonotic/darkplaces.git] / darkplaces-sdl.dev

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index bd3b77cfe6bc974686dcd9832eead7bdad3b7bd7..cdef255fac51f3a21439317cd2f74301f487648b 100755 (executable)
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,15 +1,7 @@
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r
-<<<<<<< .mine\r
-<<<<<<< .mine\r
-UnitCount=182\r
-=======\r
-UnitCount=175\r
-=======\r
 UnitCount=183\r
->>>>>>> .r9892\r
->>>>>>> .r9586\r
 Type=0\r
 Ver=1\r
 ObjFiles=\r
@@ -20,7 +12,7 @@ ResourceIncludes=
 MakeIncludes=\r
 Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main_@@__@@_\r
 CppCompiler=\r
-Linker=-lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_\r
+Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_\r
 IsCpp=0\r
 Icon=\r
 ExeOutput=\r