update libraries

• remove vcpkg • update OpenImageIO and all libraries
ssh4net · Apr 11, 2024 · 80c3315 · 80c3315
1 parent d81bf5e
commit 80c3315
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/SRC/RawGL/RawGL.vcxproj b/SRC/RawGL/RawGL.vcxproj
@@ -47,11 +47,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\..\bin\Debug</OutDir>
+    <OutDir>$(SolutionDir)\..\bin\Debug\</OutDir>
+    <ExternalIncludePath>e:\GH\vcpkg-glad\include;e:\DVR\include\boost-1_85;e:\DVR\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\..\bin\RawGL\</OutDir>
+    <ExternalIncludePath>e:\GH\vcpkg-glad\include;e:\DVR\include\boost-1_85;e:\DVR\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
@@ -65,14 +67,16 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalOptions>-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7 %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>e:\GH\vcpkg-glad\lib;e:\DVR\lib;e:\DVR\debug\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>OpenImageIO.lib;OpenImageIO_Util.lib;glad.lib;glfw3dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -83,14 +87,16 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalOptions>-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7 %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>e:\GH\vcpkg-glad\lib;e:\DVR\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>OpenImageIO.lib;OpenImageIO_Util.lib;glad.lib;glfw3dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -105,9 +111,6 @@
     <ClCompile Include="src\RawGL.cpp" />
     <ClCompile Include="src\Sequence.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="src\testshader.glsl" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\intern\AssetManager.h" />
     <ClInclude Include="src\intern\Common.h" />

diff --git a/SRC/RawGL/RawGL.vcxproj.filters b/SRC/RawGL/RawGL.vcxproj.filters
@@ -46,9 +46,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="src\testshader.glsl" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Sequence.h">
       <Filter>Header Files</Filter>

diff --git a/SRC/RawGL/RawGL.vcxproj.user b/SRC/RawGL/RawGL.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>true</ShowAllFiles>
+    <ShowAllFiles>false</ShowAllFiles>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerCommandArguments>-V 5 -P ..\..\tests\shaders\empty.vert ..\..\tests\shaders\EmptyST.frag --pass_size 333 157 --out STmap ..\..\tests\outputs\test.tif --out_format rgb16 --out_bits 8 --out_channels 3 --out_attr tiff:compression ZIP</LocalDebuggerCommandArguments>