Changeset 256


Ignore:
Timestamp:
Jan 21, 2011, 11:30:11 AM (12 years ago)
Author:
sam
Message:

SDL_mixer support on Win32.

Location:
trunk/win32
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/win32/deushax.vcxproj

    r253 r256  
    113113      <Optimization>Disabled</Optimization>
    114114      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    115       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     115      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    116116    </ClCompile>
    117117    <Link>
    118118      <SubSystem>Console</SubSystem>
    119119      <GenerateDebugInformation>true</GenerateDebugInformation>
    120       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;opengl32.lib</AdditionalDependencies>
    121       <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     120      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
     121      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    122122    </Link>
    123123  </ItemDefinitionGroup>
    … …  
    131131      <IntrinsicFunctions>true</IntrinsicFunctions>
    132132      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    133       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     133      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    134134    </ClCompile>
    135135    <Link>
    … …  
    138138      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    139139      <OptimizeReferences>true</OptimizeReferences>
    140       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;opengl32.lib</AdditionalDependencies>
    141       <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     140      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
     141      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    142142    </Link>
    143143  </ItemDefinitionGroup>

  • trunk/win32/monsterz.vcxproj

    r253 r256  
    6060    <ClCompile Include="..\src\map.cpp" />
    6161    <ClCompile Include="..\src\profiler.cpp" />
    62     <ClInclude Include="..\src\sample.cpp" />
    63     <ClInclude Include="..\src\sampler.cpp" />
     62    <ClCompile Include="..\src\sample.cpp" />
     63    <ClCompile Include="..\src\sampler.cpp" />
    6464    <ClCompile Include="..\src\scene.cpp" />
    6565    <ClCompile Include="..\src\sdlinput.cpp" />
    … …  
    115115      <Optimization>Disabled</Optimization>
    116116      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    117       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     117      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118118    </ClCompile>
    119119    <Link>
    120120      <SubSystem>Console</SubSystem>
    121121      <GenerateDebugInformation>true</GenerateDebugInformation>
    122       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;opengl32.lib</AdditionalDependencies>
    123       <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     122      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
     123      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    124124    </Link>
    125125  </ItemDefinitionGroup>
    … …  
    133133      <IntrinsicFunctions>true</IntrinsicFunctions>
    134134      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    135       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     135      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\contrib\SDL_image-1.2.10\include;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\include;$(SolutionDir)\..\contrib\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    136136    </ClCompile>
    137137    <Link>
    … …  
    140140      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    141141      <OptimizeReferences>true</OptimizeReferences>
    142       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;opengl32.lib</AdditionalDependencies>
    143       <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     142      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib;opengl32.lib</AdditionalDependencies>
     143      <AdditionalLibraryDirectories>$(SolutionDir)\..\contrib\SDL_image-1.2.10\lib;$(SolutionDir)\..\contrib\SDL_mixer-1.2.11\lib;$(SolutionDir)\..\contrib\SDL-1.2.14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    144144    </Link>
    145145  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.