diff --git a/project/vc8/PhotoshopExporter/PhotoshopExporter.vcproj b/project/vc8/PhotoshopExporter/PhotoshopExporter.vcproj index f1f1832..fc911a6 100644 --- a/project/vc8/PhotoshopExporter/PhotoshopExporter.vcproj +++ b/project/vc8/PhotoshopExporter/PhotoshopExporter.vcproj @@ -20,6 +20,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > diff --git a/project/vc8/nvassemble/nvassemble.vcproj b/project/vc8/nvassemble/nvassemble.vcproj index df7028c..6b5bc3b 100644 --- a/project/vc8/nvassemble/nvassemble.vcproj +++ b/project/vc8/nvassemble/nvassemble.vcproj @@ -21,6 +21,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -206,7 +209,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" SubSystem="1" TargetMachine="1" /> @@ -240,6 +243,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" > @@ -223,7 +226,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -259,6 +262,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -336,6 +340,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -533,7 +540,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -569,6 +576,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" > @@ -170,7 +173,7 @@ /> @@ -232,7 +236,7 @@ /> + + @@ -367,6 +375,10 @@ RelativePath="..\..\..\src\nvcore\TextWriter.h" > + + diff --git a/project/vc8/nvddsinfo/nvddsinfo.vcproj b/project/vc8/nvddsinfo/nvddsinfo.vcproj index c911f20..32fc39c 100644 --- a/project/vc8/nvddsinfo/nvddsinfo.vcproj +++ b/project/vc8/nvddsinfo/nvddsinfo.vcproj @@ -21,6 +21,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -205,7 +208,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" SubSystem="1" TargetMachine="1" /> @@ -239,6 +242,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" > @@ -223,7 +226,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" @@ -260,6 +263,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="1" WholeProgramOptimization="1" > diff --git a/project/vc8/nvimage/nvimage.vcproj b/project/vc8/nvimage/nvimage.vcproj index 50526c6..e241745 100644 --- a/project/vc8/nvimage/nvimage.vcproj +++ b/project/vc8/nvimage/nvimage.vcproj @@ -23,6 +23,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -170,7 +173,7 @@ /> @@ -232,7 +236,7 @@ /> @@ -223,7 +226,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" @@ -260,6 +263,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="1" WholeProgramOptimization="1" > diff --git a/project/vc8/nvmath/nvmath.vcproj b/project/vc8/nvmath/nvmath.vcproj index 0284de6..45688d0 100644 --- a/project/vc8/nvmath/nvmath.vcproj +++ b/project/vc8/nvmath/nvmath.vcproj @@ -23,6 +23,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -170,7 +173,7 @@ /> @@ -232,7 +236,7 @@ /> + + diff --git a/project/vc8/nvtt.sln b/project/vc8/nvtt.sln index e871070..fea27e1 100644 --- a/project/vc8/nvtt.sln +++ b/project/vc8/nvtt.sln @@ -70,8 +70,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress", "stress\stress.vcp {50C465FE-B308-42BC-894D-89484482AF06} = {50C465FE-B308-42BC-894D-89484482AF06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhotoshopExporter", "PhotoshopExporter\PhotoshopExporter.vcproj", "{6CD8908D-06E4-4FD7-907A-0A1BDA67198F}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug (no cuda)|Any CPU = Debug (no cuda)|Any CPU @@ -340,18 +338,6 @@ Global {317B694E-B5C1-42A6-956F-FC12B69175A6}.Release|Win32.ActiveCfg = Release|Win32 {317B694E-B5C1-42A6-956F-FC12B69175A6}.Release|Win32.Build.0 = Release|Win32 {317B694E-B5C1-42A6-956F-FC12B69175A6}.Release|x64.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug (no cuda)|Any CPU.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug (no cuda)|Win32.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug (no cuda)|x64.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug|Win32.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Debug|x64.ActiveCfg = Debug|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release (no cuda)|Any CPU.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release (no cuda)|Win32.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release (no cuda)|x64.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release|Any CPU.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release|Win32.ActiveCfg = Release|Win32 - {6CD8908D-06E4-4FD7-907A-0A1BDA67198F}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/project/vc8/nvtt/nvtt.vcproj b/project/vc8/nvtt/nvtt.vcproj index 93e07ed..78873e7 100644 --- a/project/vc8/nvtt/nvtt.vcproj +++ b/project/vc8/nvtt/nvtt.vcproj @@ -23,6 +23,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="2" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -208,7 +211,7 @@ Name="VCCLCompilerTool" EnableIntrinsicFunctions="true" OmitFramePointers="true" - AdditionalIncludeDirectories="..;..\..\..\src;..\..\..\gnuwin32\include;$(CUDA_INC_PATH)" + AdditionalIncludeDirectories="$(CUDA_INC_PATH)" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVTT_EXPORTS;NVTT_SHARED;HAVE_CUDA;__SSE2__;__SSE__;__MMX__" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -227,10 +230,10 @@ /> @@ -292,7 +296,7 @@ Name="VCCLCompilerTool" EnableIntrinsicFunctions="true" OmitFramePointers="true" - AdditionalIncludeDirectories="..;..\..\..\src;..\..\..\gnuwin32\include;$(CUDA_INC_PATH)" + AdditionalIncludeDirectories="$(CUDA_INC_PATH)" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVTT_EXPORTS;NVTT_SHARED;HAVE_CUDA;__SSE2__;__SSE__;__MMX__" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -314,7 +318,7 @@ AdditionalDependencies="cudart.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).dll" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\FreeImage;"$(CUDA_LIB_PATH)"" + AdditionalLibraryDirectories=""$(CUDA_LIB_PATH)"" SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -351,6 +355,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="2" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="0" > @@ -532,7 +539,7 @@ Name="VCCLCompilerTool" EnableIntrinsicFunctions="true" OmitFramePointers="true" - AdditionalIncludeDirectories="..;..\..\..\src;..\..\..\gnuwin32\include;" + AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVTT_EXPORTS;NVTT_SHARED;__SSE2__;__SSE__;__MMX__" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -551,10 +558,10 @@ /> @@ -223,7 +226,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" @@ -260,6 +263,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="1" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="1" WholeProgramOptimization="1" > diff --git a/project/vc8/squish/squish.vcproj b/project/vc8/squish/squish.vcproj index 2a313c8..b79f023 100644 --- a/project/vc8/squish/squish.vcproj +++ b/project/vc8/squish/squish.vcproj @@ -23,6 +23,7 @@ OutputDirectory="$(ConfigurationName)\$(PlatformName)" IntermediateDirectory="$(ConfigurationName)\$(PlatformName)" ConfigurationType="4" + InheritedPropertySheets="$(SolutionDir)\nvtt.vsprops" CharacterSet="2" > @@ -170,7 +173,7 @@ /> @@ -232,7 +236,7 @@ /> @@ -141,7 +143,7 @@ AdditionalDependencies="FreeImage.lib jpeg.lib libpng.lib tiff.lib zlib.lib" OutputFile="$(SolutionDir)\$(ConfigurationName).$(PlatformName)\bin\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\extern\gnuwin32\lib;..\..\..\extern\FreeImage" + AdditionalLibraryDirectories="$(GnuWinDir)\lib;$(FreeImageDir)" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2"