Changeset 1583


Ignore:
Timestamp:
Jul 5, 2012, 11:49:26 PM (8 years ago)
Author:
sam
Message:

build: recompile Win64 SDL with -D_CRTIMP= so that it uses the static runtime
library (the same that we use for the engine), and link with winmm.lib and
dxguid.lib on that platform.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Rules.props

    r1580 r1583  
    4646      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
    4747      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    48       <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='true' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    49       <AdditionalLibraryDirectories Condition="'$(UseOpenGL)'=='false' And ('$(Platform)'=='Win32' Or '$(Platform)'=='x64')">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     48      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     49      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">$(D3d9Libs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    5050      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    5151      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1575 r1583  
    1717    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
    1818    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
    19     <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
     19    <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a;winmm.lib;dxguid.lib</SdlDeps>
    2020    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
    2121
  • trunk/contrib/NOTES

    r1566 r1583  
    4343
    4444Win64:
    45 - ./configure --host=x86_64-w64-mingw32
     45- ./configure --host=x86_64-w64-mingw32 CPPFLAGS=-D_CRTIMP=
    4646- deactivate NONAMELESSUNION in src/video/windx5/directx.h
    4747- make -j6
    48 - copy build/libSDLmain.a as SDLmain.lib
    49 - copy build/.libs/libSDL.a as SDL.lib
    50 - copy build/.libs/SDL.dll as SDL.dll
     48- copy build/.libs/libSDLmain.a
     49- copy build/.libs/libSDL.a
     50- copy build/.libs/libSDL.dll.a
    5151
    5252
Note: See TracChangeset for help on using the changeset viewer.