mirror of
				https://bitbucket.org/mfeemster/fractorium.git
				synced 2025-10-30 00:40:24 -04:00 
			
		
		
		
	 7c856c929c
			
		
	
	7c856c929c
	
	
	
		
			
			-Really fix locking of affine scale. --Code changes -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder. --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports. --Remove libpng16.dll from Wix installer. -Remove all configs except for debug and release. -Remove all platforms except for x64. -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds. -Put Ember.rc in a filter folder in the project. -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator. -Move all resource files to the MSVC folder. -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl. -Rework projects to favor shadow builds. -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files. -Change WIN32 to _WIN32. -Fix a few code warnings.
		
			
				
	
	
		
			141 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
| <?xml version="1.0" encoding="utf-8"?>
 | |
| <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 | |
|   <ItemGroup Label="ProjectConfigurations">
 | |
|     <ProjectConfiguration Include="Debug|x64">
 | |
|       <Configuration>Debug</Configuration>
 | |
|       <Platform>x64</Platform>
 | |
|     </ProjectConfiguration>
 | |
|     <ProjectConfiguration Include="Release|x64">
 | |
|       <Configuration>Release</Configuration>
 | |
|       <Platform>x64</Platform>
 | |
|     </ProjectConfiguration>
 | |
|   </ItemGroup>
 | |
|   <PropertyGroup Label="Globals">
 | |
|     <ProjectGuid>{320F611A-F9CE-4196-A8DC-FA24B2E8A320}</ProjectGuid>
 | |
|     <Keyword>Win32Proj</Keyword>
 | |
|     <RootNamespace>EmberTester</RootNamespace>
 | |
|     <ProjectName>EmberTester</ProjectName>
 | |
|   </PropertyGroup>
 | |
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 | |
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 | |
|     <ConfigurationType>Application</ConfigurationType>
 | |
|     <UseDebugLibraries>true</UseDebugLibraries>
 | |
|     <CharacterSet>MultiByte</CharacterSet>
 | |
|     <WholeProgramOptimization>false</WholeProgramOptimization>
 | |
|     <PlatformToolset>v120</PlatformToolset>
 | |
|   </PropertyGroup>
 | |
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 | |
|     <ConfigurationType>Application</ConfigurationType>
 | |
|     <UseDebugLibraries>false</UseDebugLibraries>
 | |
|     <WholeProgramOptimization>false</WholeProgramOptimization>
 | |
|     <CharacterSet>MultiByte</CharacterSet>
 | |
|     <PlatformToolset>v120</PlatformToolset>
 | |
|   </PropertyGroup>
 | |
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 | |
|   <ImportGroup Label="ExtensionSettings">
 | |
|   </ImportGroup>
 | |
|   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 | |
|     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 | |
|   </ImportGroup>
 | |
|   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 | |
|     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 | |
|   </ImportGroup>
 | |
|   <PropertyGroup Label="UserMacros" />
 | |
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 | |
|     <LinkIncremental>true</LinkIncremental>
 | |
|     <OutDir>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutDir>
 | |
|     <IntDir>$(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
 | |
|   </PropertyGroup>
 | |
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 | |
|     <LinkIncremental>false</LinkIncremental>
 | |
|     <OutDir>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutDir>
 | |
|     <IntDir>$(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
 | |
|   </PropertyGroup>
 | |
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 | |
|     <ClCompile>
 | |
|       <PrecompiledHeader>Use</PrecompiledHeader>
 | |
|       <WarningLevel>Level3</WarningLevel>
 | |
|       <Optimization>Disabled</Optimization>
 | |
|       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | |
|       <ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
 | |
|       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include</AdditionalIncludeDirectories>
 | |
|       <DisableSpecificWarnings>
 | |
|       </DisableSpecificWarnings>
 | |
|       <PrecompiledHeaderFile>EmberCommonPch.h</PrecompiledHeaderFile>
 | |
|       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 | |
|       <MinimalRebuild>false</MinimalRebuild>
 | |
|       <StringPooling>true</StringPooling>
 | |
|       <FloatingPointExceptions>false</FloatingPointExceptions>
 | |
|     </ClCompile>
 | |
|     <Link>
 | |
|       <SubSystem>Console</SubSystem>
 | |
|       <GenerateDebugInformation>true</GenerateDebugInformation>
 | |
|       <AdditionalDependencies>libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;opencl.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | |
|       <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName)</AdditionalLibraryDirectories>
 | |
|     </Link>
 | |
|     <PostBuildEvent>
 | |
|       <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | |
| xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | |
| </Command>
 | |
|     </PostBuildEvent>
 | |
|   </ItemDefinitionGroup>
 | |
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 | |
|     <ClCompile>
 | |
|       <WarningLevel>Level3</WarningLevel>
 | |
|       <PrecompiledHeader>Use</PrecompiledHeader>
 | |
|       <Optimization>MaxSpeed</Optimization>
 | |
|       <FunctionLevelLinking>true</FunctionLevelLinking>
 | |
|       <IntrinsicFunctions>true</IntrinsicFunctions>
 | |
|       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | |
|       <ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
 | |
|       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include</AdditionalIncludeDirectories>
 | |
|       <DisableSpecificWarnings>
 | |
|       </DisableSpecificWarnings>
 | |
|       <PrecompiledHeaderFile>EmberCommonPch.h</PrecompiledHeaderFile>
 | |
|       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 | |
|       <StringPooling>true</StringPooling>
 | |
|       <FloatingPointExceptions>false</FloatingPointExceptions>
 | |
|       <BufferSecurityCheck>false</BufferSecurityCheck>
 | |
|     </ClCompile>
 | |
|     <Link>
 | |
|       <SubSystem>Console</SubSystem>
 | |
|       <GenerateDebugInformation>true</GenerateDebugInformation>
 | |
|       <EnableCOMDATFolding>true</EnableCOMDATFolding>
 | |
|       <OptimizeReferences>true</OptimizeReferences>
 | |
|       <AdditionalDependencies>libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;opencl.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | |
|       <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName)</AdditionalLibraryDirectories>
 | |
|     </Link>
 | |
|     <PostBuildEvent>
 | |
|       <Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
 | |
| xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
 | |
| </Command>
 | |
|     </PostBuildEvent>
 | |
|   </ItemDefinitionGroup>
 | |
|   <ItemGroup>
 | |
|     <ProjectReference Include="Ember.vcxproj">
 | |
|       <Project>{2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67}</Project>
 | |
|     </ProjectReference>
 | |
|     <ProjectReference Include="EmberCL.vcxproj">
 | |
|       <Project>{f6a9102c-69a9-48fb-bc4b-49e49af43236}</Project>
 | |
|     </ProjectReference>
 | |
|   </ItemGroup>
 | |
|   <ItemGroup>
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\EmberCommonPch.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\EmberOptions.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\JpegUtils.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\SimpleGlob.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberCommon\SimpleOpt.h" />
 | |
|     <ClInclude Include="..\..\..\Source\EmberTester\EmberTester.h" />
 | |
|   </ItemGroup>
 | |
|   <ItemGroup>
 | |
|     <ClCompile Include="..\..\..\Source\EmberCommon\EmberCommonPch.cpp">
 | |
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
 | |
|       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
 | |
|     </ClCompile>
 | |
|     <ClCompile Include="..\..\..\Source\EmberTester\EmberTester.cpp" />
 | |
|   </ItemGroup>
 | |
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 | |
|   <ImportGroup Label="ExtensionTargets">
 | |
|   </ImportGroup>
 | |
| </Project> |