Merge.

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a0a66a2df1e2308dc56f79382e8b653cdc75bda..3908731de22acb3dc43b0db7d334bc3f0e8add7e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,6 @@ set(LUGARU_H
        ${SRCDIR}/openal_wrapper.h
        ${SRCDIR}/gamegl.h
        ${SRCDIR}/glstubs.h
-       ${SRCDIR}/md5.h
        ${SRCDIR}/mmgr.h
        ${SRCDIR}/nommgr.h
        ${SRCDIR}/pack_private.h
@@ -206,14 +205,16 @@ if (NOT SDL_FOUND)
         set(LUGARU_HAS_INTERNAL_SDL True)
         if (MSVC)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/msvc/SDL.lib
               ${SDLDIR}/lib/win32/msvc/SDLmain.lib
+              ${SDLDIR}/lib/win32/msvc/SDL.lib
           )
         endif (MSVC)
         if (MINGW)
           set(SDL_LIBRARY
-              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "mingw32"
               ${SDLDIR}/lib/win32/mingw/libSDLmain.a
+              ${SDLDIR}/lib/win32/mingw/libSDL.dll.a
+              "-mwindows"
           )
         endif (MINGW)
     endif (WIN32)