Changeset 968
- Timestamp:
- Sep 20, 2011, 6:07:31 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 2 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/debug/quad.cpp
r960 r968 13 13 #endif 14 14 15 #if def WIN3215 #if defined WIN32 && !defined _XBOX 16 16 # define _USE_MATH_DEFINES /* for M_PI */ 17 17 # define WIN32_LEAN_AND_MEAN -
trunk/src/debug/sphere.cpp
r783 r968 13 13 #endif 14 14 15 #if def WIN3215 #if defined WIN32 && !defined _XBOX 16 16 # define _USE_MATH_DEFINES /* for M_PI */ 17 17 # define WIN32_LEAN_AND_MEAN -
trunk/src/tileset.cpp
r866 r968 18 18 #include <cstring> 19 19 20 #if def WIN3220 #if defined WIN32 && !defined _XBOX 21 21 # define WIN32_LEAN_AND_MEAN 22 22 # include <windows.h> -
trunk/src/timer.cpp
r798 r968 19 19 # include <sys/time.h> 20 20 # include <unistd.h> 21 #elif defined _XBOX 22 # include <xtl.h> 23 # include <xbox.h> 21 24 #elif defined _WIN32 22 25 # define WIN32_LEAN_AND_MEAN -
trunk/src/video.cpp
r960 r968 15 15 #include <cmath> 16 16 17 #if def WIN3217 #if defined _WIN32 && !defined _XBOX 18 18 # define WIN32_LEAN_AND_MEAN 19 19 # include <windows.h> -
trunk/win32/Contribs.props
r954 r968 15 15 <GlLibs>$(GlewDir)\lib\i686-w64-mingw32</GlLibs> 16 16 <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs> 17 <SdlLibs>$(SdlDir)\lib ;$(SdlImageDir)\lib;$(SdlMixerDir)\lib</SdlLibs>17 <SdlLibs>$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs> 18 18 <GlDeps>opengl32.lib;glew32.lib</GlDeps> 19 19 <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps> 20 20 <SdlDeps>SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps> 21 <LolDefines>USE_GLEW</LolDefines> 21 <Win32Defines>USE_GLEW</Win32Defines> 22 <XboxDefines></XboxDefines> 22 23 </PropertyGroup> 23 24 <PropertyGroup /> … … 40 41 <BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro> 41 42 <BuildMacro Include="SdlDeps"><Value>$(SdlDeps)</Value></BuildMacro> 42 <BuildMacro Include="LolDefines"><Value>$(LolDefines)</Value></BuildMacro> 43 <BuildMacro Include="Win32Defines"><Value>$(Win32Defines)</Value></BuildMacro> 44 <BuildMacro Include="XboxDefines"><Value>$(XboxDefines)</Value></BuildMacro> 43 45 </ItemGroup> 44 46 </Project> -
trunk/win32/deushax.vcxproj
r906 r968 6 6 <Platform>Win32</Platform> 7 7 </ProjectConfiguration> 8 <ProjectConfiguration Include="Debug|Xbox 360"> 9 <Configuration>Debug</Configuration> 10 <Platform>Xbox 360</Platform> 11 </ProjectConfiguration> 8 12 <ProjectConfiguration Include="Release|Win32"> 9 13 <Configuration>Release</Configuration> 10 14 <Platform>Win32</Platform> 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Release|Xbox 360"> 17 <Configuration>Release</Configuration> 18 <Platform>Xbox 360</Platform> 11 19 </ProjectConfiguration> 12 20 </ItemGroup> … … 32 40 <UseOfMfc>Dynamic</UseOfMfc> 33 41 </PropertyGroup> 42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> 43 <ConfigurationType>Application</ConfigurationType> 44 <UseDebugLibraries>true</UseDebugLibraries> 45 <CharacterSet>Unicode</CharacterSet> 46 <UseOfMfc>Dynamic</UseOfMfc> 47 </PropertyGroup> 34 48 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 49 <ConfigurationType>Application</ConfigurationType> 50 <UseDebugLibraries>false</UseDebugLibraries> 51 <WholeProgramOptimization>true</WholeProgramOptimization> 52 <CharacterSet>Unicode</CharacterSet> 53 <UseOfMfc>Dynamic</UseOfMfc> 54 </PropertyGroup> 55 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> 35 56 <ConfigurationType>Application</ConfigurationType> 36 57 <UseDebugLibraries>false</UseDebugLibraries> … … 46 67 <Import Project="Contribs.props" /> 47 68 </ImportGroup> 69 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="PropertySheets"> 70 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 71 <Import Project="Contribs.props" /> 72 </ImportGroup> 48 73 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 74 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 75 <Import Project="Contribs.props" /> 76 </ImportGroup> 77 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="PropertySheets"> 49 78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 50 79 <Import Project="Contribs.props" /> … … 55 84 <LinkIncremental>true</LinkIncremental> 56 85 </PropertyGroup> 86 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 87 <IntDir>Debug\$(ProjectName)\</IntDir> 88 <LinkIncremental>true</LinkIncremental> 89 </PropertyGroup> 57 90 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 91 <IntDir>Release\$(ProjectName)\</IntDir> 92 <LinkIncremental>false</LinkIncremental> 93 </PropertyGroup> 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 58 95 <IntDir>Release\$(ProjectName)\</IntDir> 59 96 <LinkIncremental>false</LinkIncremental> … … 65 102 <WarningLevel>Level3</WarningLevel> 66 103 <Optimization>Disabled</Optimization> 67 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 104 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 105 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 106 </ClCompile> 107 <Link> 108 <SubSystem>Console</SubSystem> 109 <GenerateDebugInformation>true</GenerateDebugInformation> 110 <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);$(GlDeps)</AdditionalDependencies> 111 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 112 </Link> 113 <PostBuildEvent> 114 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 115 </PostBuildEvent> 116 </ItemDefinitionGroup> 117 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 118 <ClCompile> 119 <PrecompiledHeader> 120 </PrecompiledHeader> 121 <WarningLevel>Level3</WarningLevel> 122 <Optimization>Disabled</Optimization> 123 <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 68 124 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 69 125 </ClCompile> … … 86 142 <FunctionLevelLinking>true</FunctionLevelLinking> 87 143 <IntrinsicFunctions>true</IntrinsicFunctions> 88 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 144 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 145 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 146 </ClCompile> 147 <Link> 148 <SubSystem>Console</SubSystem> 149 <GenerateDebugInformation>true</GenerateDebugInformation> 150 <EnableCOMDATFolding>true</EnableCOMDATFolding> 151 <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);$(SdlDeps);$(GlDeps)</AdditionalDependencies> 153 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 154 </Link> 155 <PostBuildEvent> 156 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 157 </PostBuildEvent> 158 </ItemDefinitionGroup> 159 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 160 <ClCompile> 161 <WarningLevel>Level3</WarningLevel> 162 <PrecompiledHeader> 163 </PrecompiledHeader> 164 <Optimization>MaxSpeed</Optimization> 165 <FunctionLevelLinking>true</FunctionLevelLinking> 166 <IntrinsicFunctions>true</IntrinsicFunctions> 167 <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 89 168 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 90 169 </ClCompile> -
trunk/win32/editor.vcxproj
r906 r968 6 6 <Platform>Win32</Platform> 7 7 </ProjectConfiguration> 8 <ProjectConfiguration Include="Debug|Xbox 360"> 9 <Configuration>Debug</Configuration> 10 <Platform>Xbox 360</Platform> 11 </ProjectConfiguration> 8 12 <ProjectConfiguration Include="Release|Win32"> 9 13 <Configuration>Release</Configuration> 10 14 <Platform>Win32</Platform> 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Release|Xbox 360"> 17 <Configuration>Release</Configuration> 18 <Platform>Xbox 360</Platform> 11 19 </ProjectConfiguration> 12 20 </ItemGroup> … … 32 40 <UseOfMfc>Dynamic</UseOfMfc> 33 41 </PropertyGroup> 42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> 43 <ConfigurationType>Application</ConfigurationType> 44 <UseDebugLibraries>true</UseDebugLibraries> 45 <CharacterSet>Unicode</CharacterSet> 46 <UseOfMfc>Dynamic</UseOfMfc> 47 </PropertyGroup> 34 48 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 49 <ConfigurationType>Application</ConfigurationType> 50 <UseDebugLibraries>false</UseDebugLibraries> 51 <WholeProgramOptimization>true</WholeProgramOptimization> 52 <CharacterSet>Unicode</CharacterSet> 53 <UseOfMfc>Dynamic</UseOfMfc> 54 </PropertyGroup> 55 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> 35 56 <ConfigurationType>Application</ConfigurationType> 36 57 <UseDebugLibraries>false</UseDebugLibraries> … … 46 67 <Import Project="Contribs.props" /> 47 68 </ImportGroup> 69 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="PropertySheets"> 70 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 71 <Import Project="Contribs.props" /> 72 </ImportGroup> 48 73 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 74 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 75 <Import Project="Contribs.props" /> 76 </ImportGroup> 77 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="PropertySheets"> 49 78 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 50 79 <Import Project="Contribs.props" /> … … 55 84 <LinkIncremental>true</LinkIncremental> 56 85 </PropertyGroup> 86 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 87 <IntDir>Debug\$(ProjectName)\</IntDir> 88 <LinkIncremental>true</LinkIncremental> 89 </PropertyGroup> 57 90 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 91 <IntDir>Release\$(ProjectName)\</IntDir> 92 <LinkIncremental>false</LinkIncremental> 93 </PropertyGroup> 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 58 95 <IntDir>Release\$(ProjectName)\</IntDir> 59 96 <LinkIncremental>false</LinkIncremental> … … 65 102 <WarningLevel>Level3</WarningLevel> 66 103 <Optimization>Disabled</Optimization> 67 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 104 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 105 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 106 </ClCompile> 107 <Link> 108 <SubSystem>Console</SubSystem> 109 <GenerateDebugInformation>true</GenerateDebugInformation> 110 <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);$(GlDeps)</AdditionalDependencies> 111 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 112 </Link> 113 <PostBuildEvent> 114 <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 115 </PostBuildEvent> 116 </ItemDefinitionGroup> 117 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 118 <ClCompile> 119 <PrecompiledHeader> 120 </PrecompiledHeader> 121 <WarningLevel>Level3</WarningLevel> 122 <Optimization>Disabled</Optimization> 123 <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 68 124 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 69 125 </ClCompile> … … 86 142 <FunctionLevelLinking>true</FunctionLevelLinking> 87 143 <IntrinsicFunctions>true</IntrinsicFunctions> 88 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 144 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 145 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 146 </ClCompile> 147 <Link> 148 <SubSystem>Console</SubSystem> 149 <GenerateDebugInformation>true</GenerateDebugInformation> 150 <EnableCOMDATFolding>true</EnableCOMDATFolding> 151 <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);$(SdlDeps);$(GtkDeps);$(GlDeps)</AdditionalDependencies> 153 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);$(GtkLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 154 </Link> 155 <PostBuildEvent> 156 <Command>for %%I in ($(GtkLibs) $(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 157 </PostBuildEvent> 158 </ItemDefinitionGroup> 159 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 160 <ClCompile> 161 <WarningLevel>Level3</WarningLevel> 162 <PrecompiledHeader> 163 </PrecompiledHeader> 164 <Optimization>MaxSpeed</Optimization> 165 <FunctionLevelLinking>true</FunctionLevelLinking> 166 <IntrinsicFunctions>true</IntrinsicFunctions> 167 <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 89 168 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\deushax;$(GlIncludes);$(SdlIncludes);$(GtkIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 90 169 </ClCompile> -
trunk/win32/lolcore.vcxproj
r911 r968 6 6 <Platform>Win32</Platform> 7 7 </ProjectConfiguration> 8 <ProjectConfiguration Include="Debug|Xbox 360"> 9 <Configuration>Debug</Configuration> 10 <Platform>Xbox 360</Platform> 11 </ProjectConfiguration> 8 12 <ProjectConfiguration Include="Release|Win32"> 9 13 <Configuration>Release</Configuration> 10 14 <Platform>Win32</Platform> 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Release|Xbox 360"> 17 <Configuration>Release</Configuration> 18 <Platform>Xbox 360</Platform> 11 19 </ProjectConfiguration> 12 20 </ItemGroup> … … 22 30 <CharacterSet>Unicode</CharacterSet> 23 31 </PropertyGroup> 32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> 33 <ConfigurationType>StaticLibrary</ConfigurationType> 34 <UseDebugLibraries>true</UseDebugLibraries> 35 <CharacterSet>Unicode</CharacterSet> 36 </PropertyGroup> 24 37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 25 38 <ConfigurationType>StaticLibrary</ConfigurationType> … … 28 41 <CharacterSet>Unicode</CharacterSet> 29 42 </PropertyGroup> 43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> 44 <ConfigurationType>StaticLibrary</ConfigurationType> 45 <UseDebugLibraries>false</UseDebugLibraries> 46 <WholeProgramOptimization>true</WholeProgramOptimization> 47 <CharacterSet>Unicode</CharacterSet> 48 </PropertyGroup> 30 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 31 50 <ImportGroup Label="ExtensionSettings"> … … 35 54 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 36 55 </ImportGroup> 56 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="PropertySheets"> 57 <Import Project="Contribs.props" /> 58 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 59 </ImportGroup> 37 60 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 61 <Import Project="Contribs.props" /> 62 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 63 </ImportGroup> 64 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="PropertySheets"> 38 65 <Import Project="Contribs.props" /> 39 66 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> … … 47 74 <WarningLevel>Level3</WarningLevel> 48 75 <Optimization>Disabled</Optimization> 49 <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 76 <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 77 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 78 <FloatingPointModel>Fast</FloatingPointModel> 79 </ClCompile> 80 <Link> 81 <SubSystem>Windows</SubSystem> 82 <GenerateDebugInformation>true</GenerateDebugInformation> 83 </Link> 84 </ItemDefinitionGroup> 85 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 86 <ClCompile> 87 <PrecompiledHeader> 88 </PrecompiledHeader> 89 <WarningLevel>Level3</WarningLevel> 90 <Optimization>Disabled</Optimization> 91 <PreprocessorDefinitions>_XBOX;_DEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 50 92 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 51 93 <FloatingPointModel>Fast</FloatingPointModel> … … 64 106 <FunctionLevelLinking>true</FunctionLevelLinking> 65 107 <IntrinsicFunctions>true</IntrinsicFunctions> 66 <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 108 <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 109 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 110 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> 111 <FloatingPointModel>Fast</FloatingPointModel> 112 </ClCompile> 113 <Link> 114 <SubSystem>Windows</SubSystem> 115 <GenerateDebugInformation>true</GenerateDebugInformation> 116 <EnableCOMDATFolding>true</EnableCOMDATFolding> 117 <OptimizeReferences>true</OptimizeReferences> 118 </Link> 119 </ItemDefinitionGroup> 120 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 121 <ClCompile> 122 <WarningLevel>Level3</WarningLevel> 123 <PrecompiledHeader> 124 </PrecompiledHeader> 125 <Optimization>MaxSpeed</Optimization> 126 <FunctionLevelLinking>true</FunctionLevelLinking> 127 <IntrinsicFunctions>true</IntrinsicFunctions> 128 <PreprocessorDefinitions>_XBOX;NDEBUG;_LIB;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 67 129 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 68 130 <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> … … 102 164 <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" /> 103 165 <ClCompile Include="..\src\profiler.cpp" /> 166 <ClCompile Include="..\src\real.cpp" /> 104 167 <ClCompile Include="..\src\sample.cpp" /> 105 168 <ClCompile Include="..\src\sampler.cpp" /> … … 148 211 <ClInclude Include="..\src\platform\sdl\sdlinput.h" /> 149 212 <ClInclude Include="..\src\profiler.h" /> 213 <ClInclude Include="..\src\real.h" /> 150 214 <ClInclude Include="..\src\sample.h" /> 151 215 <ClInclude Include="..\src\sampler.h" /> -
trunk/win32/lolcore.vcxproj.filters
r906 r968 140 140 <Filter>src\platform\sdl</Filter> 141 141 </ClCompile> 142 <ClCompile Include="..\src\real.cpp"> 143 <Filter>src</Filter> 144 </ClCompile> 142 145 </ItemGroup> 143 146 <ItemGroup> … … 277 280 <Filter>src\platform\sdl</Filter> 278 281 </ClInclude> 282 <ClInclude Include="..\src\real.h"> 283 <Filter>src</Filter> 284 </ClInclude> 279 285 </ItemGroup> 280 286 </Project> -
trunk/win32/lolengine.sln
r911 r968 30 30 EndProjectSection 31 31 EndProject 32 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = " lol-bench", "lol-bench.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"32 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" 33 33 ProjectSection(ProjectDependencies) = postProject 34 34 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} 35 35 EndProjectSection 36 36 EndProject 37 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = " lol-test", "lol-test.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"37 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}" 38 38 ProjectSection(ProjectDependencies) = postProject 39 39 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} … … 43 43 GlobalSection(SolutionConfigurationPlatforms) = preSolution 44 44 Debug|Win32 = Debug|Win32 45 Debug|Xbox 360 = Debug|Xbox 360 45 46 Release|Win32 = Release|Win32 47 Release|Xbox 360 = Release|Xbox 360 46 48 EndGlobalSection 47 49 GlobalSection(ProjectConfigurationPlatforms) = postSolution 48 50 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32 49 51 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32 52 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 53 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 54 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 50 55 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32 51 56 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32 57 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 58 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Build.0 = Release|Xbox 360 59 {EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 52 60 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32 53 61 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.Build.0 = Debug|Win32 62 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 63 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 64 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 54 65 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32 55 66 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32 67 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 68 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Build.0 = Release|Xbox 360 69 {17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 56 70 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32 57 71 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32 72 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 73 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 74 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 58 75 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32 59 76 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32 77 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 78 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.Build.0 = Release|Xbox 360 79 {9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 60 80 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32 61 81 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32 82 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 83 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 84 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 62 85 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32 63 86 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32 87 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 88 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360 89 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 64 90 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.ActiveCfg = Debug|Win32 65 91 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32 92 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 93 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 94 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 66 95 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32 67 96 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32 97 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 98 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Build.0 = Release|Xbox 360 99 {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 68 100 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 69 101 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.Build.0 = Debug|Win32 102 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 103 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 104 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 70 105 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32 71 106 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32 107 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 108 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.Build.0 = Release|Xbox 360 109 {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 72 110 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.ActiveCfg = Debug|Win32 73 111 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.Build.0 = Debug|Win32 112 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 113 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 114 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 74 115 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.ActiveCfg = Release|Win32 75 116 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.Build.0 = Release|Win32 117 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 118 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.Build.0 = Release|Xbox 360 119 {80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 76 120 EndGlobalSection 77 121 GlobalSection(SolutionProperties) = preSolution -
trunk/win32/monsterz.vcxproj
r906 r968 6 6 <Platform>Win32</Platform> 7 7 </ProjectConfiguration> 8 <ProjectConfiguration Include="Debug|Xbox 360"> 9 <Configuration>Debug</Configuration> 10 <Platform>Xbox 360</Platform> 11 </ProjectConfiguration> 8 12 <ProjectConfiguration Include="Release|Win32"> 9 13 <Configuration>Release</Configuration> 10 14 <Platform>Win32</Platform> 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Release|Xbox 360"> 17 <Configuration>Release</Configuration> 18 <Platform>Xbox 360</Platform> 11 19 </ProjectConfiguration> 12 20 </ItemGroup> … … 41 49 <UseOfMfc>Dynamic</UseOfMfc> 42 50 </PropertyGroup> 51 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> 52 <ConfigurationType>Application</ConfigurationType> 53 <UseDebugLibraries>true</UseDebugLibraries> 54 <CharacterSet>Unicode</CharacterSet> 55 <UseOfMfc>Dynamic</UseOfMfc> 56 </PropertyGroup> 43 57 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 58 <ConfigurationType>Application</ConfigurationType> 59 <UseDebugLibraries>false</UseDebugLibraries> 60 <WholeProgramOptimization>true</WholeProgramOptimization> 61 <CharacterSet>Unicode</CharacterSet> 62 <UseOfMfc>Dynamic</UseOfMfc> 63 </PropertyGroup> 64 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> 44 65 <ConfigurationType>Application</ConfigurationType> 45 66 <UseDebugLibraries>false</UseDebugLibraries> … … 55 76 <Import Project="Contribs.props" /> 56 77 </ImportGroup> 78 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="PropertySheets"> 79 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 80 <Import Project="Contribs.props" /> 81 </ImportGroup> 57 82 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 83 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 84 <Import Project="Contribs.props" /> 85 </ImportGroup> 86 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="PropertySheets"> 58 87 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 59 88 <Import Project="Contribs.props" /> … … 64 93 <LinkIncremental>true</LinkIncremental> 65 94 </PropertyGroup> 95 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 96 <IntDir>Debug\$(ProjectName)\</IntDir> 97 <LinkIncremental>true</LinkIncremental> 98 </PropertyGroup> 66 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 100 <IntDir>Release\$(ProjectName)\</IntDir> 101 <LinkIncremental>false</LinkIncremental> 102 </PropertyGroup> 103 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 67 104 <IntDir>Release\$(ProjectName)\</IntDir> 68 105 <LinkIncremental>false</LinkIncremental> … … 74 111 <WarningLevel>Level3</WarningLevel> 75 112 <Optimization>Disabled</Optimization> 76 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 113 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 114 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 115 </ClCompile> 116 <Link> 117 <SubSystem>Console</SubSystem> 118 <GenerateDebugInformation>true</GenerateDebugInformation> 119 <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);$(GlDeps)</AdditionalDependencies> 120 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 121 </Link> 122 <PostBuildEvent> 123 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 124 </PostBuildEvent> 125 </ItemDefinitionGroup> 126 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 127 <ClCompile> 128 <PrecompiledHeader> 129 </PrecompiledHeader> 130 <WarningLevel>Level3</WarningLevel> 131 <Optimization>Disabled</Optimization> 132 <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 77 133 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 78 134 </ClCompile> … … 95 151 <FunctionLevelLinking>true</FunctionLevelLinking> 96 152 <IntrinsicFunctions>true</IntrinsicFunctions> 97 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 153 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 154 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 155 </ClCompile> 156 <Link> 157 <SubSystem>Console</SubSystem> 158 <GenerateDebugInformation>true</GenerateDebugInformation> 159 <EnableCOMDATFolding>true</EnableCOMDATFolding> 160 <OptimizeReferences>true</OptimizeReferences> 161 <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);$(GlDeps)</AdditionalDependencies> 162 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 163 </Link> 164 <PostBuildEvent> 165 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 166 </PostBuildEvent> 167 </ItemDefinitionGroup> 168 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 169 <ClCompile> 170 <WarningLevel>Level3</WarningLevel> 171 <PrecompiledHeader> 172 </PrecompiledHeader> 173 <Optimization>MaxSpeed</Optimization> 174 <FunctionLevelLinking>true</FunctionLevelLinking> 175 <IntrinsicFunctions>true</IntrinsicFunctions> 176 <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 98 177 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 99 178 </ClCompile> -
trunk/win32/quad.vcxproj
r911 r968 6 6 <Platform>Win32</Platform> 7 7 </ProjectConfiguration> 8 <ProjectConfiguration Include="Debug|Xbox 360"> 9 <Configuration>Debug</Configuration> 10 <Platform>Xbox 360</Platform> 11 </ProjectConfiguration> 8 12 <ProjectConfiguration Include="Release|Win32"> 9 13 <Configuration>Release</Configuration> 10 14 <Platform>Win32</Platform> 15 </ProjectConfiguration> 16 <ProjectConfiguration Include="Release|Xbox 360"> 17 <Configuration>Release</Configuration> 18 <Platform>Xbox 360</Platform> 11 19 </ProjectConfiguration> 12 20 </ItemGroup> … … 26 34 <UseOfMfc>Dynamic</UseOfMfc> 27 35 </PropertyGroup> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration"> 37 <ConfigurationType>Application</ConfigurationType> 38 <UseDebugLibraries>true</UseDebugLibraries> 39 <CharacterSet>Unicode</CharacterSet> 40 <UseOfMfc>Dynamic</UseOfMfc> 41 </PropertyGroup> 28 42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 43 <ConfigurationType>Application</ConfigurationType> 44 <UseDebugLibraries>false</UseDebugLibraries> 45 <WholeProgramOptimization>true</WholeProgramOptimization> 46 <CharacterSet>Unicode</CharacterSet> 47 <UseOfMfc>Dynamic</UseOfMfc> 48 </PropertyGroup> 49 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration"> 29 50 <ConfigurationType>Application</ConfigurationType> 30 51 <UseDebugLibraries>false</UseDebugLibraries> … … 40 61 <Import Project="Contribs.props" /> 41 62 </ImportGroup> 63 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="PropertySheets"> 64 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 65 <Import Project="Contribs.props" /> 66 </ImportGroup> 42 67 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 68 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 69 <Import Project="Contribs.props" /> 70 </ImportGroup> 71 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="PropertySheets"> 43 72 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 44 73 <Import Project="Contribs.props" /> … … 49 78 <LinkIncremental>true</LinkIncremental> 50 79 </PropertyGroup> 80 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 81 <IntDir>Debug\$(ProjectName)\</IntDir> 82 <LinkIncremental>true</LinkIncremental> 83 </PropertyGroup> 51 84 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 85 <IntDir>Release\$(ProjectName)\</IntDir> 86 <LinkIncremental>false</LinkIncremental> 87 </PropertyGroup> 88 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 52 89 <IntDir>Release\$(ProjectName)\</IntDir> 53 90 <LinkIncremental>false</LinkIncremental> … … 59 96 <WarningLevel>Level3</WarningLevel> 60 97 <Optimization>Disabled</Optimization> 61 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 98 <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 99 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 100 </ClCompile> 101 <Link> 102 <SubSystem>Console</SubSystem> 103 <GenerateDebugInformation>true</GenerateDebugInformation> 104 <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);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies> 105 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 106 </Link> 107 <PostBuildEvent> 108 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 109 </PostBuildEvent> 110 </ItemDefinitionGroup> 111 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'"> 112 <ClCompile> 113 <PrecompiledHeader> 114 </PrecompiledHeader> 115 <WarningLevel>Level3</WarningLevel> 116 <Optimization>Disabled</Optimization> 117 <PreprocessorDefinitions>_XBOX;_DEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 62 118 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 63 119 </ClCompile> … … 80 136 <FunctionLevelLinking>true</FunctionLevelLinking> 81 137 <IntrinsicFunctions>true</IntrinsicFunctions> 82 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 138 <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(Win32Defines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 139 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 140 </ClCompile> 141 <Link> 142 <SubSystem>Console</SubSystem> 143 <GenerateDebugInformation>true</GenerateDebugInformation> 144 <EnableCOMDATFolding>true</EnableCOMDATFolding> 145 <OptimizeReferences>true</OptimizeReferences> 146 <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);$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies> 147 <AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 148 </Link> 149 <PostBuildEvent> 150 <Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command> 151 </PostBuildEvent> 152 </ItemDefinitionGroup> 153 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'"> 154 <ClCompile> 155 <WarningLevel>Level3</WarningLevel> 156 <PrecompiledHeader> 157 </PrecompiledHeader> 158 <Optimization>MaxSpeed</Optimization> 159 <FunctionLevelLinking>true</FunctionLevelLinking> 160 <IntrinsicFunctions>true</IntrinsicFunctions> 161 <PreprocessorDefinitions>_XBOX;NDEBUG;_CONSOLE;$(XboxDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> 83 162 <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 84 163 </ClCompile>
Note: See TracChangeset
for help on using the changeset viewer.