Просмотр исходного кода

test: add a few Visual Studio 2010 project files and fix testsuite code

so that it builds properly.
legacy
Sam Hocevar sam 13 лет назад
Родитель
Сommit
0e622822e7
10 измененных файлов: 226 добавлений и 54 удалений
  1. +3
    -3
      test/half.cpp
  2. +27
    -0
      test/lol-bench.cpp
  3. +8
    -1
      test/lol-test.cpp
  4. +34
    -0
      test/trig.cpp
  5. +21
    -45
      win32/Contribs.props
  6. +5
    -3
      win32/lol-bench.vcxproj
  7. +103
    -0
      win32/lol-test.vcxproj
  8. +4
    -1
      win32/lolcore.vcxproj
  9. +20
    -0
      win32/lolengine.sln
  10. +1
    -1
      win32/quad.vcxproj

+ 3
- 3
test/half.cpp Просмотреть файл

@@ -324,9 +324,9 @@ HalfTest::TestPair const HalfTest::pairs[] =
{ 0.5f, 0x3800 },
{ 0.125f, 0x3000 },
{ 15.9375f, 0x4bf8 },
{ 0x1.fp-10, 0x17c0 },
{ 0x1.fp-14, 0x07c0 }, /* denormal */
{ 0x1.fp-15, 0x03e0 }, /* denormal */
{ 31.0f / (1 << 14), 0x17c0 }, /* 0x1.fp-10 */
{ 31.0f / (1 << 18), 0x07c0 }, /* 0x1.fp-14, denormal */
{ 31.0f / (1 << 19), 0x03e0 }, /* 0x1.fp-15, denormal */
};

CPPUNIT_TEST_SUITE_REGISTRATION(HalfTest);


+ 27
- 0
test/lol-bench.cpp Просмотреть файл

@@ -12,6 +12,12 @@
# include "config.h"
#endif

#ifdef WIN32
# define _USE_MATH_DEFINES /* for M_PI */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif

#include <cstdio>

#if defined HAVE_FASTMATH_H
@@ -69,6 +75,10 @@ int main(int argc, char **argv)
Log::Info("-----------------------------------\n");
bench_half(2);

#if defined _WIN32
getchar();
#endif

return EXIT_SUCCESS;
}

@@ -103,7 +113,11 @@ static void bench_trig(int mode)
/* Sin */
timer.GetMs();
for (size_t i = 0; i < TRIG_TABLE_SIZE; i++)
#if defined __GNUC__
pf2[i] = __builtin_sinf(pf[i]);
#else
pf2[i] = sinf(pf[i]);
#endif
result[0] += timer.GetMs();

/* Fast sin */
@@ -125,7 +139,11 @@ static void bench_trig(int mode)
/* Cos */
timer.GetMs();
for (size_t i = 0; i < TRIG_TABLE_SIZE; i++)
#if defined __GNUC__
pf2[i] = __builtin_cosf(pf[i]);
#else
pf2[i] = cosf(pf[i]);
#endif
result[3] += timer.GetMs();

/* Fast cos */
@@ -148,8 +166,13 @@ static void bench_trig(int mode)
timer.GetMs();
for (size_t i = 0; i < TRIG_TABLE_SIZE; i++)
{
#if defined __GNUC__
pf2[i] = __builtin_sinf(pf[i]);
pf3[i] = __builtin_cosf(pf[i]);
#else
pf2[i] = sinf(pf[i]);
pf3[i] = cosf(pf[i]);
#endif
}
result[6] += timer.GetMs();

@@ -176,7 +199,11 @@ static void bench_trig(int mode)
/* Tan */
timer.GetMs();
for (size_t i = 0; i < TRIG_TABLE_SIZE; i++)
#if defined __GNUC__
pf2[i] = __builtin_tanf(pf[i]);
#else
pf2[i] = tanf(pf[i]);
#endif
result[9] += timer.GetMs();

/* Fast tan */


+ 8
- 1
test/lol-test.cpp Просмотреть файл

@@ -12,6 +12,8 @@
# include "config.h"
#endif

#include <cstdio>

#include <cppunit/TextTestRunner.h>
#include <cppunit/extensions/TestFactoryRegistry.h>

@@ -20,6 +22,11 @@ int main(int argc, char *argv[])
CppUnit::TextTestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());

return !runner.run();
int ret = !runner.run();

#if defined _WIN32
getchar();
#endif
return ret;
}


+ 34
- 0
test/trig.cpp Просмотреть файл

@@ -42,7 +42,11 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 1000.0);
#if defined __GNUC__
double a = __builtin_sin(f);
#else
double a = sin(f);
#endif
double b = lol_sin(f);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
}
@@ -50,7 +54,11 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 100000.0);
#if defined __GNUC__
double a = __builtin_sin(f);
#else
double a = sin(f);
#endif
double b = lol_sin(f);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
}
@@ -58,7 +66,11 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 1000.0);
#if defined __GNUC__
double a = __builtin_cos(f);
#else
double a = cos(f);
#endif
double b = lol_cos(f);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
}
@@ -66,7 +78,11 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 100000.0);
#if defined __GNUC__
double a = __builtin_cos(f);
#else
double a = cos(f);
#endif
double b = lol_cos(f);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(f) * 1e-11);
}
@@ -74,8 +90,13 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 1000.0);
#if defined __GNUC__
double a1 = __builtin_sin(f);
double a2 = __builtin_cos(f);
#else
double a1 = sin(f);
double a2 = cos(f);
#endif
double b1, b2;
lol_sincos(f, &b1, &b2);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, fabs(f) * 1e-11);
@@ -85,8 +106,13 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 100000.0);
#if defined __GNUC__
double a1 = __builtin_sin(f);
double a2 = __builtin_cos(f);
#else
double a1 = sin(f);
double a2 = cos(f);
#endif
double b1, b2;
lol_sincos(f, &b1, &b2);
CPPUNIT_ASSERT_DOUBLES_EQUAL(a1, b1, fabs(f) * 1e-11);
@@ -96,7 +122,11 @@ public:
for (int i = -100000; i < 100000; i++)
{
double f = (double)i * (1.0 / 10000.0);
#if defined __GNUC__
double a = __builtin_tan(f);
#else
double a = tan(f);
#endif
double b = lol_tan(f);
if (fabs(a) > 1e4)
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * fabs(a) * 1e-11);
@@ -109,7 +139,11 @@ public:
for (int i = -10000; i < 10000; i++)
{
double f = (double)i * (1.0 / 100000.0);
#if defined __GNUC__
double a = __builtin_tan(f);
#else
double a = tan(f);
#endif
double b = lol_tan(f);
if (fabs(a) > 1e4)
CPPUNIT_ASSERT_DOUBLES_EQUAL(a, b, fabs(a) * fabs(a) * 1e-11);


+ 21
- 45
win32/Contribs.props Просмотреть файл

@@ -3,15 +3,18 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<ContribDir>$(SolutionDir)\..\contrib</ContribDir>
<CppUnitDir>$(ContribDir)\cppunit-1.12.2</CppUnitDir>
<GlewDir>$(ContribDir)\glew-1.6.0</GlewDir>
<GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
<GtkGlDir>$(ContribDir)\gtkglarea-2.0.1</GtkGlDir>
<SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
<SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
<SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
<CppUnitIncludes>$(CppUnitDir)\include</CppUnitIncludes>
<GlIncludes>$(GlewDir)\include</GlIncludes>
<GtkIncludes>$(GtkDir)\lib\glib-2.0\include;$(GtkDir)\lib\gtk-2.0\include;$(GtkDir)\include\glib-2.0;$(GtkDir)\include\gtk-2.0;$(GtkDir)\include\cairo;$(GtkDir)\include\pango-1.0;$(GtkDir)\include\gdk-pixbuf-2.0;$(GtkDir)\include\atk-1.0;$(GtkGlDir)\include</GtkIncludes>
<SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
<CppUnitLibs>$(CppUnitDir)\lib</CppUnitLibs>
<GlLibs>$(GlewDir)\lib</GlLibs>
<GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
<SdlLibs>$(SdlDir)\lib;$(SdlImageDir)\lib;$(SdlMixerDir)\lib</SdlLibs>
@@ -24,51 +27,24 @@
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="ContribDir"><Value>$(ContribDir)</Value></BuildMacro>
<BuildMacro Include="CppUnitDir"><Value>$(CppUnitDir)</Value></BuildMacro>
<BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
<BuildMacro Include="GtkDir">
<Value>$(GtkDir)</Value>
</BuildMacro>
<BuildMacro Include="GtkGlDir">
<Value>$(GtkGlDir)</Value>
</BuildMacro>
<BuildMacro Include="SdlDir">
<Value>$(SdlDir)</Value>
</BuildMacro>
<BuildMacro Include="SdlImageDir">
<Value>$(SdlImageDir)</Value>
</BuildMacro>
<BuildMacro Include="SdlMixerDir">
<Value>$(SdlMixerDir)</Value>
</BuildMacro>
<BuildMacro Include="GlIncludes">
<Value>$(GlIncludes)</Value>
</BuildMacro>
<BuildMacro Include="GtkIncludes">
<Value>$(GtkIncludes)</Value>
</BuildMacro>
<BuildMacro Include="SdlIncludes">
<Value>$(SdlIncludes)</Value>
</BuildMacro>
<BuildMacro Include="GlLibs">
<Value>$(GlLibs)</Value>
</BuildMacro>
<BuildMacro Include="GtkLibs">
<Value>$(GtkLibs)</Value>
</BuildMacro>
<BuildMacro Include="SdlLibs">
<Value>$(SdlLibs)</Value>
</BuildMacro>
<BuildMacro Include="GlDeps">
<Value>$(GlDeps)</Value>
</BuildMacro>
<BuildMacro Include="GtkDeps">
<Value>$(GtkDeps)</Value>
</BuildMacro>
<BuildMacro Include="SdlDeps">
<Value>$(SdlDeps)</Value>
</BuildMacro>
<BuildMacro Include="LolDefines">
<Value>$(LolDefines)</Value>
</BuildMacro>
<BuildMacro Include="GtkDir"><Value>$(GtkDir)</Value></BuildMacro>
<BuildMacro Include="GtkGlDir"><Value>$(GtkGlDir)</Value></BuildMacro>
<BuildMacro Include="SdlDir"><Value>$(SdlDir)</Value></BuildMacro>
<BuildMacro Include="SdlImageDir"><Value>$(SdlImageDir)</Value></BuildMacro>
<BuildMacro Include="SdlMixerDir"><Value>$(SdlMixerDir)</Value></BuildMacro>
<BuildMacro Include="CppUnitIncludes"><Value>$(CppUnitIncludes)</Value></BuildMacro>
<BuildMacro Include="GlIncludes"><Value>$(GlIncludes)</Value></BuildMacro>
<BuildMacro Include="GtkIncludes"><Value>$(GtkIncludes)</Value></BuildMacro>
<BuildMacro Include="SdlIncludes"><Value>$(SdlIncludes)</Value></BuildMacro>
<BuildMacro Include="CppUnitLibss"><Value>$(CppUnitLibss)</Value></BuildMacro>
<BuildMacro Include="GlLibs"><Value>$(GlLibs)</Value></BuildMacro>
<BuildMacro Include="GtkLibs"><Value>$(GtkLibs)</Value></BuildMacro>
<BuildMacro Include="SdlLibs"><Value>$(SdlLibs)</Value></BuildMacro>
<BuildMacro Include="GlDeps"><Value>$(GlDeps)</Value></BuildMacro>
<BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro>
<BuildMacro Include="SdlDeps"><Value>$(SdlDeps)</Value></BuildMacro>
<BuildMacro Include="LolDefines"><Value>$(LolDefines)</Value></BuildMacro>
</ItemGroup>
</Project>

+ 5
- 3
win32/lol-bench.vcxproj Просмотреть файл

@@ -14,7 +14,7 @@
<ClCompile Include="..\test\lol-bench.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid>
<ProjectGuid>{B1E10086-A1DA-401A-834D-969C9DBB5CC1}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>testmap</RootNamespace>
</PropertyGroup>
@@ -60,6 +60,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -81,13 +82,14 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<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>
<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>
<AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
@@ -97,4 +99,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

+ 103
- 0
win32/lol-test.vcxproj Просмотреть файл

@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\test\half.cpp" />
<ClCompile Include="..\test\lol-test.cpp" />
<ClCompile Include="..\test\matrix.cpp" />
<ClCompile Include="..\test\trig.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>testmap</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="Contribs.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="Contribs.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>Debug\$(ProjectName)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>Release\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(CppUnitIncludes);$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<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);libcppunit_msvcd.lib;$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SdlLibs);$(CppUnitLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(CppUnitIncludes);$(GlIncludes);$(SdlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<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);libcppunit_msvc.lib;$(GlDeps);$(OutDir)\lolcore.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SdlLibs);$(CppUnitLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>for %%I in ($(SdlLibs)) do xcopy /y /c /d %%I\*.dll $(TargetDir)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

+ 4
- 1
win32/lolcore.vcxproj Просмотреть файл

@@ -48,6 +48,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -64,6 +65,8 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(LolDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(GlIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -163,4 +166,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

+ 20
- 0
win32/lolengine.sln Просмотреть файл

@@ -29,6 +29,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "quad.vcxproj", "{53
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-bench", "lol-bench.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
ProjectSection(ProjectDependencies) = postProject
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol-test", "lol-test.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}"
ProjectSection(ProjectDependencies) = postProject
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -55,6 +65,14 @@ Global
{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32
{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32
{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.Build.0 = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32
{80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.ActiveCfg = Debug|Win32
{80F81C11-8DA2-4990-91CB-9807783BA46E}.Debug|Win32.Build.0 = Debug|Win32
{80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.ActiveCfg = Release|Win32
{80F81C11-8DA2-4990-91CB-9807783BA46E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -64,5 +82,7 @@ Global
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F}
{17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC}
{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
{B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF}
{80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
EndGlobalSection
EndGlobal

+ 1
- 1
win32/quad.vcxproj Просмотреть файл

@@ -87,7 +87,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<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>
<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>
<AdditionalLibraryDirectories>$(SdlLibs);$(GlLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>


Загрузка…
Отмена
Сохранить