Skip to content

Commit

Permalink
Visual project updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
jfdelnero committed Jan 29, 2021
1 parent 3fc1bc2 commit ddb93de
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand All @@ -51,13 +51,13 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\..\lib_jtag_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<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;%(AdditionalDependencies);libjtagcore.lib</AdditionalDependencies>
<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);libjtagcore.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\Debug</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
Expand All @@ -69,7 +69,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\..\lib_jtag_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
Expand All @@ -78,19 +78,17 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\Release</AdditionalLibraryDirectories>
<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;%(AdditionalDependencies);libjtagcore.lib</AdditionalDependencies>
<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);libjtagcore.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\fileselector.c" />
<ClCompile Include="..\..\JTAGBoundaryScanner.c" />
<ClCompile Include="..\..\script.c" />
<ClCompile Include="..\..\socket.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\fileselector.h" />
<ClInclude Include="..\..\JTAGBoundaryScanner.h" />
<ClInclude Include="..\..\script.h" />
<ClInclude Include="..\..\socket.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<ClCompile Include="..\..\fileselector.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\socket.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\fileselector.h">
Expand All @@ -32,6 +35,9 @@
<ClInclude Include="..\..\resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="..\..\socket.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\JTAGBoundaryScanner.rc">
Expand Down
11 changes: 11 additions & 0 deletions lib_jtag_core/build/win32/libjtagcore/libjtagcore/libjtagcore.def
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ EXPORTS
jtagcore_init @1
jtagcore_set_logs_callback @2
jtagcore_set_logs_level @3
setOutputFunc @4
jtagcore_deinit @9

jtagcore_scan_and_init_chain @10
Expand Down Expand Up @@ -47,3 +48,13 @@ EXPORTS
jtagcore_memory_set_ctrl_pin @403
jtagcore_memory_read @404
jtagcore_memory_write @405

jtagcore_setEnvVar @500
jtagcore_getEnvVar @501
jtagcore_getEnvVarValue @502
jtagcore_getEnvVarIndex @503

jtagcore_execScriptLine @600
jtagcore_execScriptFile @601
jtagcore_execScriptRam @602
jtagcore_savePinsStateScript @603
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@
<ProjectGuid>{9B544082-5943-417E-80EE-4A75BD42FFF1}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libjtagcore</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand All @@ -74,12 +74,13 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>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>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -104,14 +105,15 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>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>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -149,6 +151,12 @@
<ClCompile Include="..\..\..\..\src\drivers\jlink_jtag\jlink_jtag_drv.c" />
<ClCompile Include="..\..\..\..\src\drivers\lpt_jtag\lpt_jtag_drv.c" />
<ClCompile Include="..\..\..\..\src\jtag_core.c" />
<ClCompile Include="..\..\..\..\src\natsort\strnatcmp.c" />
<ClCompile Include="..\..\..\..\src\os_interface\fs.c" />
<ClCompile Include="..\..\..\..\src\os_interface\network.c" />
<ClCompile Include="..\..\..\..\src\os_interface\os_interface.c" />
<ClCompile Include="..\..\..\..\src\script\env.c" />
<ClCompile Include="..\..\..\..\src\script\script.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\bsdl_parser\bsdl_loader.h" />
Expand All @@ -160,6 +168,11 @@
<ClInclude Include="..\..\..\..\src\drivers\jlink_jtag\jlink_jtag_drv.h" />
<ClInclude Include="..\..\..\..\src\drivers\lpt_jtag\lpt_jtag_drv.h" />
<ClInclude Include="..\..\..\..\src\jtag_core.h" />
<ClInclude Include="..\..\..\..\src\natsort\strnatcmp.h" />
<ClInclude Include="..\..\..\..\src\os_interface\network.h" />
<ClInclude Include="..\..\..\..\src\os_interface\os_interface.h" />
<ClInclude Include="..\..\..\..\src\script\env.h" />
<ClInclude Include="..\..\..\..\src\script\script.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
<Filter Include="Source Files\probes_drivers\jlink_jtag">
<UniqueIdentifier>{b133c262-64c0-4c10-98d2-9273a0aa1823}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\script">
<UniqueIdentifier>{0d894a93-bc5b-44ed-b3a8-f515e210dcbd}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\os_interface">
<UniqueIdentifier>{37845971-d551-4785-a39e-ee1fc76f7dd2}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\natsort">
<UniqueIdentifier>{a1dd8db6-2666-4df8-af6b-ec8f74d2a5e5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
Expand Down Expand Up @@ -75,6 +84,24 @@
<ClCompile Include="..\..\..\..\src\bus_over_jtag\memory_over_jtag.c">
<Filter>Source Files\bus_over_jtag</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\script\env.c">
<Filter>Source Files\script</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\script\script.c">
<Filter>Source Files\script</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\os_interface\fs.c">
<Filter>Source Files\os_interface</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\os_interface\network.c">
<Filter>Source Files\os_interface</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\os_interface\os_interface.c">
<Filter>Source Files\os_interface</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\natsort\strnatcmp.c">
<Filter>Source Files\natsort</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\bsdl_parser\bsdl_loader.h">
Expand Down Expand Up @@ -104,5 +131,20 @@
<ClInclude Include="..\..\..\..\src\jtag_core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\script\env.h">
<Filter>Source Files\script</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\script\script.h">
<Filter>Source Files\script</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\os_interface\network.h">
<Filter>Source Files\os_interface</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\os_interface\os_interface.h">
<Filter>Source Files\os_interface</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\natsort\strnatcmp.h">
<Filter>Source Files\natsort</Filter>
</ClInclude>
</ItemGroup>
</Project>

0 comments on commit ddb93de

Please sign in to comment.