Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.lib filter=lfs diff=lfs merge=lfs -text
4 changes: 2 additions & 2 deletions .yamato/windows-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Win - Build & Test VCS plugins
agent:
type: Unity::VM
image: core-kaunas/win10-vs2010:latest
image: vcs-ecosystem/win10-vs2019-perforce-plugin:latest
flavor: b1.large

interpreter: powershell
Expand All @@ -18,4 +18,4 @@ artifacts:
logs:
paths:
- "win_build.txt"
- "win_test.txt"
- "win_test.txt"
7 changes: 5 additions & 2 deletions P4Plugin/P4Plugin.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,21 @@
<ProjectGuid>{06DFA5BA-ACFC-4170-9143-5B2D1E654180}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>P4Plugin2</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -148,7 +151,7 @@ _SCL_SECURE_NO_DEPRECATE
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProjectDir)Source\r19.1\lib\win32debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>crypt32.lib;libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
Expand All @@ -174,7 +177,7 @@ _SCL_SECURE_NO_DEPRECATE
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(ProjectDir)Source\r19.1\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>crypt32.lib;libclient.lib;libeay32.lib;libp4script.lib;libp4script_c.lib;libp4script_curl.lib;libp4script_sqlite.lib;librpc.lib;libsupp.lib;ssleay32.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
Expand Down
Binary file added P4Plugin/Source/r19.1/lib/win32/libMT.pdb
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libclient.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libeay32.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libp4script.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libp4script_c.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libp4script_curl.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libp4script_sqlite.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/librpc.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/libsupp.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32/ssleay32.lib
Binary file not shown.
Binary file added P4Plugin/Source/r19.1/lib/win32debug/libMTd.pdb
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libclient.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libeay32.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libp4script.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libp4script_c.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libp4script_curl.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libp4script_sqlite.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/librpc.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/libsupp.lib
Binary file not shown.
Binary file modified P4Plugin/Source/r19.1/lib/win32debug/ssleay32.lib
Binary file not shown.
5 changes: 4 additions & 1 deletion Test/TestServer/TestServer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@
<ProjectGuid>{64C0D8D3-68C7-46C6-B341-0ED1C78B225B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>TestServer</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -101,4 +104,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions msbuilder.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if exist "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%PROGRAMFILES%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
if exist "%REALVSPATH%\Common7\Tools\vsvars32.bat" call "%REALVSPATH%\Common7\Tools\vsvars32.bat"
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsMSBuildCmd.bat"
if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsMSBuildCmd.bat"

call msbuild %1 /t:Clean;%2 /p:Configuration=Release;Platform=%3