Changeset 1654Tweet

Timestamp:

Jul 19, 2012, 10:48:11 PM (11 years ago)

Author:

sam

Message:

build: put the Win64 SDL libraries in two separate directories, MSVC-built
and MinGW-built, because of some weird %rip corruption at runtime when
linking the MSVC DLL with mingw-w64.

Location:

trunk

Files:

• build/vs2010/Lol.Core.Vars.props (modified) (1 diff)
• contrib/NOTES (modified) (1 diff)
• contrib/sdl-1.2.15/lib/x86_64-msvc (added)
• contrib/sdl-1.2.15/lib/x86_64-msvc/SDL.dll (moved) (moved from trunk/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDL.dll)
• contrib/sdl-1.2.15/lib/x86_64-msvc/SDL.lib (moved) (moved from trunk/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDL.lib)
• contrib/sdl-1.2.15/lib/x86_64-msvc/SDLmain.lib (moved) (moved from trunk/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDLmain.lib)
• contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/libSDL.dll.a (added)

trunk/build/vs2010/Lol.Core.Vars.props

@@ -15 +15 @@
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
     <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
-    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
+    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc</SdlLibs>
     <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
     <SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib</SdlDeps>

trunk/contrib/NOTES

@@ -46 +46 @@
 
     ./configure --host=x86_64-w64-mingw32
-    make build/libSDLmain.la
+    make clean all
 
 - copy build/.libs/libSDLmain.a
+- copy build/.libs/libSDL.dll.a