visual studio build fix.

viveris · Mar 5, 2024 · 1d13833 · 1d13833
1 parent 7f4b5e5
commit 1d13833
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/jtag_boundary_scanner_gui/win32/JTAGBoundaryScanner.rc b/jtag_boundary_scanner_gui/win32/JTAGBoundaryScanner.rc
@@ -32,8 +32,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_JTAGTEST ICON DISCARDABLE "JTAGBoundaryScanner.ico"
-IDI_SMALL ICON DISCARDABLE "JTAGBoundaryScanner_small.ico"
+IDI_JTAGTEST ICON DISCARDABLE "images/JTAGBoundaryScanner.ico"
+IDI_SMALL ICON DISCARDABLE "images/JTAGBoundaryScanner_small.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -371,8 +371,8 @@ END
 // Bitmap
 //
 
-IDB_BITMAP1 BITMAP DISCARDABLE "viveris.bmp"
-IDB_IOBLOCK BITMAP DISCARDABLE "ioblock.bmp"
+IDB_BITMAP1 BITMAP DISCARDABLE "images/viveris.bmp"
+IDB_IOBLOCK BITMAP DISCARDABLE "images/ioblock.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/...ary_scanner_gui/win32/JTAGBoundaryScanner/JTAGBoundaryScanner/JTAGBoundaryScanner.vcxproj b/...ary_scanner_gui/win32/JTAGBoundaryScanner/JTAGBoundaryScanner/JTAGBoundaryScanner.vcxproj
@@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <WholeProgramOptimization>true</WholeProgramOptimization>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>

diff --git a/lib_jtag_core/build/win32/libjtagcore/libjtagcore/libjtagcore.vcxproj b/lib_jtag_core/build/win32/libjtagcore/libjtagcore/libjtagcore.vcxproj
@@ -28,26 +28,26 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
  <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
  <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
  <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <WholeProgramOptimization>true</WholeProgramOptimization>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  <ConfigurationType>DynamicLibrary</ConfigurationType>
  <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
  <WholeProgramOptimization>true</WholeProgramOptimization>
  <CharacterSet>NotSet</CharacterSet>
  </PropertyGroup>
@@ -79,7 +79,7 @@
  <Link>
  <SubSystem>Windows</SubSystem>
  <GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile>libjtagcore.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\..\..\src\os_interface\win32\libjtagcore.def</ModuleDefinitionFile>
  <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;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
  </ItemDefinitionGroup>
@@ -94,7 +94,7 @@
  <Link>
  <SubSystem>Windows</SubSystem>
  <GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile>libjtagcore.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\..\..\src\os_interface\win32\libjtagcore.def</ModuleDefinitionFile>
  </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -112,7 +112,7 @@
  <GenerateDebugInformation>true</GenerateDebugInformation>
  <EnableCOMDATFolding>true</EnableCOMDATFolding>
  <OptimizeReferences>true</OptimizeReferences>
- <ModuleDefinitionFile>libjtagcore.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\..\..\src\os_interface\win32\libjtagcore.def</ModuleDefinitionFile>
  <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;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
  </Link>
  </ItemDefinitionGroup>
@@ -131,7 +131,7 @@
  <GenerateDebugInformation>true</GenerateDebugInformation>
  <EnableCOMDATFolding>true</EnableCOMDATFolding>
  <OptimizeReferences>true</OptimizeReferences>
- <ModuleDefinitionFile>libjtagcore.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\..\..\src\os_interface\win32\libjtagcore.def</ModuleDefinitionFile>
  </Link>
  </ItemDefinitionGroup>
  <ItemGroup>