Changeset 1583
- Timestamp:
- Jul 5, 2012, 11:49:26 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build/vs2010/Lol.Core.Rules.props
r1580 r1583 46 46 <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> 47 47 <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> 50 50 <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 51 51 <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 17 17 <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs> 18 18 <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> 20 20 <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines> 21 21 -
trunk/contrib/NOTES
r1566 r1583 43 43 44 44 Win64: 45 - ./configure --host=x86_64-w64-mingw32 45 - ./configure --host=x86_64-w64-mingw32 CPPFLAGS=-D_CRTIMP= 46 46 - deactivate NONAMELESSUNION in src/video/windx5/directx.h 47 47 - make -j6 48 - copy build/ libSDLmain.a as SDLmain.lib49 - copy build/.libs/libSDL.a as SDL.lib50 - copy build/.libs/ SDL.dll as SDL.dll48 - copy build/.libs/libSDLmain.a 49 - copy build/.libs/libSDL.a 50 - copy build/.libs/libSDL.dll.a 51 51 52 52
Note: See TracChangeset
for help on using the changeset viewer.