diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/vc++/3rdparty/SDL2/SDL2.vcxproj | 6 | ||||
-rw-r--r-- | build/vc++/jin.vcxproj | 4 | ||||
-rw-r--r-- | build/vc++/jin/jin.vcxproj | 4 | ||||
-rw-r--r-- | build/vc++/libjin/libjin.vcxproj | 16 | ||||
-rw-r--r-- | build/vc++/libjin/libjin.vcxproj.filters | 36 |
5 files changed, 34 insertions, 32 deletions
diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj b/build/vc++/3rdparty/SDL2/SDL2.vcxproj index 8daa81d..cbd29bd 100644 --- a/build/vc++/3rdparty/SDL2/SDL2.vcxproj +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj @@ -78,16 +78,17 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> + <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <BufferSecurityCheck>false</BufferSecurityCheck> <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> <OmitDefaultLibName>true</OmitDefaultLibName> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BufferSecurityCheck>false</BufferSecurityCheck> </ClCompile> <Link> <AdditionalDependencies>winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -95,6 +96,7 @@ <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj index bfbf21e..7bec5ae 100644 --- a/build/vc++/jin.vcxproj +++ b/build/vc++/jin.vcxproj @@ -84,7 +84,7 @@ <WarningLevel>Level3</WarningLevel> <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)libs\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;$(SolutionDir)..\..\src\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <CompileAs>CompileAsCpp</CompileAs> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> @@ -113,7 +113,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)libs\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;$(SolutionDir)..\..\src\3rdparty\SDL2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <CompileAs>CompileAsCpp</CompileAs> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj index 6a6f0af..efc5188 100644 --- a/build/vc++/jin/jin.vcxproj +++ b/build/vc++/jin/jin.vcxproj @@ -83,7 +83,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <ConformanceMode>false</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -100,7 +100,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>false</ConformanceMode> - <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index 671eec7..e0672d7 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -86,7 +86,7 @@ <ConformanceMode>false</ConformanceMode> <CompileAs>CompileAsCpp</CompileAs> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> </ClCompile> @@ -102,7 +102,7 @@ <SDLCheck>true</SDLCheck> <ConformanceMode>false</ConformanceMode> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(SolutionDir)libs\SDL2-2.0.5\include;$(SolutionDir)..\..\src\3rdparty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\3rdparty\SDL2\include;$(SolutionDir)..\..\src\3rdparty\</AdditionalIncludeDirectories> <CompileAs>CompileAsCpp</CompileAs> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> @@ -170,12 +170,12 @@ <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_ttf.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphics.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_batch.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_sheet.h" /> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_single.h" /> + <ClInclude Include="..\..\..\src\libjin\graphics\je_graphic_manager.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\je_image.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\je_mesh.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h" /> + <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h" /> + <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_sheet.h" /> <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h" /> <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h" /> @@ -242,12 +242,12 @@ <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_text.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_ttf.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_batch.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_sheet.cpp" /> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_single.cpp" /> + <ClCompile Include="..\..\..\src\libjin\graphics\je_graphic_manager.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\je_image.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\je_mesh.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.cpp" /> + <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp" /> + <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_sheet.cpp" /> <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp" /> <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp" /> <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp" /> diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters index ea8dbd8..8ec97c1 100644 --- a/build/vc++/libjin/libjin.vcxproj.filters +++ b/build/vc++/libjin/libjin.vcxproj.filters @@ -273,9 +273,6 @@ <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h"> <Filter>source\graphics\particle</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_batch.h"> - <Filter>source\graphics</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h"> <Filter>source\game</Filter> </ClInclude> @@ -285,12 +282,6 @@ <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animation.h"> <Filter>source\graphics\animation</Filter> </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_single.h"> - <Filter>source\graphics</Filter> - </ClInclude> - <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_sheet.h"> - <Filter>source\graphics</Filter> - </ClInclude> <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\shaders\je_default.shader.h"> <Filter>source\graphics\shader\shaders</Filter> </ClInclude> @@ -306,6 +297,15 @@ <ClInclude Include="..\..\..\src\libjin\Game\je_gameobject.h"> <Filter>source\game</Filter> </ClInclude> + <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h"> + <Filter>source\graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_sheet.h"> + <Filter>source\graphics</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\libjin\graphics\je_graphic_manager.h"> + <Filter>source\graphics</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\..\src\libjin\README.md"> @@ -445,9 +445,6 @@ <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp"> <Filter>source\graphics\particle</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_batch.cpp"> - <Filter>source\graphics</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp"> <Filter>source\game</Filter> </ClCompile> @@ -457,17 +454,20 @@ <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animation.cpp"> <Filter>source\graphics\animation</Filter> </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_single.cpp"> - <Filter>source\graphics</Filter> - </ClCompile> - <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_sheet.cpp"> - <Filter>source\graphics</Filter> - </ClCompile> <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp"> <Filter>source\game</Filter> </ClCompile> <ClCompile Include="..\..\..\src\libjin\Game\je_gameobject.cpp"> <Filter>source\game</Filter> </ClCompile> + <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp"> + <Filter>source\graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_sheet.cpp"> + <Filter>source\graphics</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\libjin\graphics\je_graphic_manager.cpp"> + <Filter>source\graphics</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file |