Changeset 327


Ignore:
Timestamp:
Feb 1, 2011, 2:20:43 PM (12 years ago)
Author:
sam
Message:

Add all the bells and whistles needed for GTK+ compilation on Win32.

Location:
trunk
Files:
2 added
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/deushax/gtk/editor.cpp

    r228 r327  
    99
    1010#include <cstdlib>
     11#if defined _WIN32
     12#   include <direct.h>
     13#endif
    1114
    1215#include <gtk/gtk.h>
    … …  
    4043    /* Build the application interface */
    4144    GtkBuilder *builder = gtk_builder_new();
     45#if defined _WIN32
     46    _chdir(".."); /* Temporary Win32 hack */
     47#endif
    4248    if (!gtk_builder_add_from_file(builder, "deushax/gtk/editor.xml", NULL))
    4349    {

  • trunk/win32/deushax.vcxproj

    r312 r327  
    100100  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    101101    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     102    <Import Project="Contribs.props" />
    102103  </ImportGroup>
    103104  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    104105    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     106    <Import Project="Contribs.props" />
    105107  </ImportGroup>
    106108  <PropertyGroup Label="UserMacros" />
    … …  
    120122      <Optimization>Disabled</Optimization>
    121123      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    122       <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>
     124      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    123125    </ClCompile>
    124126    <Link>
    125127      <SubSystem>Console</SubSystem>
    126128      <GenerateDebugInformation>true</GenerateDebugInformation>
    127       <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>
    128       <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>
     129      <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);$(SdlDeps);opengl32.lib</AdditionalDependencies>
     130      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    129131    </Link>
    130132  </ItemDefinitionGroup>
    … …  
    138140      <IntrinsicFunctions>true</IntrinsicFunctions>
    139141      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    140       <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>
     142      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    141143    </ClCompile>
    142144    <Link>
    … …  
    145147      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    146148      <OptimizeReferences>true</OptimizeReferences>
    147       <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>
    148       <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>
     149      <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);$(SdlDeps);opengl32.lib</AdditionalDependencies>
     150      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    149151    </Link>
    150152  </ItemDefinitionGroup>

  • trunk/win32/editor.vcxproj

    r326 r327  
    1212  </ItemGroup>
    1313  <ItemGroup>
    14     <ClInclude Include="..\deushax\debugsprite.h" />
    15     <ClInclude Include="..\deushax\game.h" />
     14    <ClInclude Include="..\deushax\gtk\glmapview.h" />
     15    <ClInclude Include="..\deushax\mapviewer.h" />
    1616    <ClInclude Include="..\src\audio.h" />
    1717    <ClInclude Include="..\src\bitfield.h" />
    … …  
    4646  </ItemGroup>
    4747  <ItemGroup>
    48     <ClCompile Include="..\deushax\debugsprite.cpp" />
    49     <ClCompile Include="..\deushax\deushax.cpp" />
    50     <ClCompile Include="..\deushax\game.cpp" />
     48    <ClCompile Include="..\deushax\gtk\editor.cpp" />
     49    <ClCompile Include="..\deushax\gtk\glmapview.cpp" />
     50    <ClCompile Include="..\deushax\mapviewer.cpp" />
    5151    <ClCompile Include="..\src\audio.cpp" />
    5252    <ClCompile Include="..\src\debugfps.cpp" />
    … …  
    7777  </ItemGroup>
    7878  <PropertyGroup Label="Globals">
    79     <ProjectGuid>{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}</ProjectGuid>
     79    <ProjectGuid>{9C66B179-0737-4BDA-AB42-2ADE478A9008}</ProjectGuid>
    8080    <Keyword>Win32Proj</Keyword>
    8181    <RootNamespace>testmap</RootNamespace>
    … …  
    100100  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    101101    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     102    <Import Project="Contribs.props" />
    102103  </ImportGroup>
    103104  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    104105    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     106    <Import Project="Contribs.props" />
    105107  </ImportGroup>
    106108  <PropertyGroup Label="UserMacros" />
    … …  
    120122      <Optimization>Disabled</Optimization>
    121123      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    122       <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>
     124      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    123125    </ClCompile>
    124126    <Link>
    125127      <SubSystem>Console</SubSystem>
    126128      <GenerateDebugInformation>true</GenerateDebugInformation>
    127       <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>
    128       <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>
     129      <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);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
     130      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    129131    </Link>
    130132  </ItemDefinitionGroup>
    … …  
    138140      <IntrinsicFunctions>true</IntrinsicFunctions>
    139141      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    140       <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>
     142      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    141143    </ClCompile>
    142144    <Link>
    … …  
    145147      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    146148      <OptimizeReferences>true</OptimizeReferences>
    147       <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>
    148       <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>
     149      <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);$(SdlDeps);$(GtkDeps);opengl32.lib</AdditionalDependencies>
     150      <AdditionalLibraryDirectories>$(SdlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    149151    </Link>
    150152  </ItemDefinitionGroup>

  • trunk/win32/lolengine.sln

    r224 r327  
    55EndProject
    66Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
     7EndProject
     8Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
    79EndProject
    810Global
    … …  
    2022                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
    2123                {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
     24                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
     25                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32
     26                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
     27                {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32
    2228        EndGlobalSection
    2329        GlobalSection(SolutionProperties) = preSolution

  • trunk/win32/monsterz.vcxproj

    r321 r327  
    105105  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    106106    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     107    <Import Project="Contribs.props" />
    107108  </ImportGroup>
    108109  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    109110    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     111    <Import Project="Contribs.props" />
    110112  </ImportGroup>
    111113  <PropertyGroup Label="UserMacros" />
    … …  
    125127      <Optimization>Disabled</Optimization>
    126128      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    127       <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>
     129      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    128130    </ClCompile>
    129131    <Link>
    130132      <SubSystem>Console</SubSystem>
    131133      <GenerateDebugInformation>true</GenerateDebugInformation>
    132       <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>
    133       <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>
     134      <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);$(SdlDeps);opengl32.lib</AdditionalDependencies>
     135      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    134136    </Link>
    135137  </ItemDefinitionGroup>
    … …  
    143145      <IntrinsicFunctions>true</IntrinsicFunctions>
    144146      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    145       <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>
     147      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    146148    </ClCompile>
    147149    <Link>
    … …  
    150152      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    151153      <OptimizeReferences>true</OptimizeReferences>
    152       <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>
    153       <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>
     154      <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);$(SdlDeps);opengl32.lib</AdditionalDependencies>
     155      <AdditionalLibraryDirectories>$(SdlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    154156    </Link>
    155157  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.