Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pig work #2

Open
wants to merge 127 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
c020ac9
Pig Projects to use same Platform Toolset as the other projects
Astn Dec 9, 2017
e8fb125
Now building PigConfig,PigGUID,PigsLib. Still broken PigSrv,PigAccts
Astn Dec 10, 2017
13b557c
Get PigSrv to compile
Astn Dec 10, 2017
6482f90
Merge branch 'master' of https://github.com/AllegianceZone/Allegiance-FA
Astn Dec 10, 2017
cb54cbe
Merge branch 'master' into PigWork
Astn Dec 10, 2017
3286ccd
Build PigConfig PigGUID PigsLib PigSrv when solution builds. Remove .…
Astn Dec 11, 2017
3a07e9d
Set PigSrv and PigsLib to be dependant on Engine. Removed some .js fr…
Astn Dec 11, 2017
a6f03a5
FZRetail now builds PigsLib PigSrv PigConfig and PigGUID, not yet bui…
Astn Dec 11, 2017
01e1788
Fix more dependency problems with PigsLib
Astn Dec 11, 2017
e6fad56
Dont build pigs in release mode yet. Update includes for PigsLib in F…
Astn Dec 12, 2017
121572c
Create pigClient project
Astn Dec 19, 2017
073f141
Don't call out to PigAccounts
Astn Dec 20, 2017
35df835
Better Pig Client
Astn Dec 20, 2017
a337980
Revert "Don't call out to PigAccounts"
Astn Dec 20, 2017
80c3b36
Choose a script by default
Astn Dec 20, 2017
88c8ebd
Changed post build steps, added steam integration
BackTrak Dec 20, 2017
0c657f2
loggin message change
Astn Dec 21, 2017
cb98438
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
Astn Dec 21, 2017
a4f96bd
Enhance PigClient Info
Astn Dec 21, 2017
56f6267
Added Imago's bot stuff from AZ, fixing and learning about bots!
BackTrak Dec 21, 2017
eaa0a94
Various fixes to enable imago's pig script to launch games. Also, dev…
BackTrak Dec 21, 2017
d1292e6
Added to PigShip:: AttackShip,AttackStation, MissileRange, MissileLock.
Astn Dec 31, 2017
9bd1193
Try harder to get other ships
Astn Dec 31, 2017
dacf4c5
Pig.cpp - Make sure all the pigs get the same state changes.
Astn Jan 1, 2018
c914173
Merge remote-tracking branch 'remotes/origin/master' into PigWork
Astn Jan 1, 2018
93efdfc
Merge branch 'master' of https://github.com/AllegianceZone/Allegiance-FA
Astn Jan 1, 2018
f033033
Merge branch 'master' into PigWork
Astn Jan 1, 2018
93f87c6
PigAccts.ini [general]/CdKey property.
Astn Jan 2, 2018
27acae7
Add missing script files.
Astn Jan 3, 2018
74c91c4
renamed 1.pig to b1.pig so its not at the top of the list, it doesn't…
Astn Jan 3, 2018
36e83a8
PigSrv: Send CDKey when pig logs in.
Astn Jan 3, 2018
750b24e
PigClient now restarts PigSrv if it crashes and gets the pigs back.
Astn Jan 3, 2018
75d6bfd
Lobby allows clients to bypass the authentication check if it has a m…
Astn Jan 4, 2018
32f9016
Repathed System.Reactive to find packages folder relative to solution…
BackTrak Jan 4, 2018
ae57a7f
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 4, 2018
7d10ab4
Add Appveyor.yml to project root
Astn Jan 4, 2018
f0239c9
Use PigClient as output assembly name.
Astn Jan 5, 2018
d89d984
Added bot authentication guid to enable pigsrv to bypass steam auth o…
BackTrak Jan 5, 2018
5314f7d
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 5, 2018
eaf065f
Fix ship selection
Astn Jan 5, 2018
6646927
solution folder to see aaa.pig and includes
Astn Jan 5, 2018
d4681f4
Add package restore
Astn Jan 5, 2018
fabfbc8
Update appveyor.yml
Astn Jan 5, 2018
08c26f6
Add post build step to register AGC and PigsLib
Astn Jan 5, 2018
5866167
Build Order: PigClient depends on AGC and Pigslib
Astn Jan 5, 2018
79a0d0b
Don't build PigClient with the solution as it depends on AGC.dll and …
Astn Jan 5, 2018
12a8c33
Remove PigClient from solution, not having any success with build ord…
Astn Jan 5, 2018
1ae9245
Revert 08c26f6 5866167 79a0d0b 12a8c33
Astn Jan 5, 2018
3375ea4
Merge branch 'master' of https://github.com/AllegianceZone/Allegiance-FA
Astn Jan 5, 2018
cdde4eb
Merge FreeAllegiance/Allegiance
Astn Jan 5, 2018
6ae57dc
Fix a few merge errors
Astn Jan 5, 2018
d61ef2a
Merge pull request #5 from AllegianceZone/MergeWithUpstream
Astn Jan 5, 2018
f09580e
Fix lauch delay
Astn Jan 5, 2018
28a77d8
Remove debug stuff; Slight fixes for TM6/10
Radulfr4 Jan 5, 2018
8f448f6
Improve post carrier land behaviour; Fix Phoenix drones landing online;
Radulfr4 Jan 5, 2018
1641c03
Merge pull request #68 from Radulfr4/TrainingII
pvandommelen Jan 5, 2018
667ad20
Merge pull request #67 from AllegianceZone/AppVeyorConfig
pvandommelen Jan 5, 2018
1eec241
Forgot to free up memory after getting a UUID converted to a string.
BackTrak Jan 5, 2018
eec8c00
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 5, 2018
d4fd2a0
Pig tries to join a specific team, or a team commanded by someone fro…
Astn Jan 6, 2018
2ad1c0f
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
Astn Jan 6, 2018
38f8e67
Pigs allow other @OINKs to join their team
Astn Jan 6, 2018
6536584
If a pig joins and get mission owner, it will set the settings and la…
Astn Jan 7, 2018
965ef61
PigClient: Auto add pig to meet minRatio, or minPigs.
Astn Jan 7, 2018
bfe44cc
Remove excess pigs according to decrease ratio
Astn Jan 7, 2018
f6224f6
Continute to try to launch the game until an opponent shows up.
Astn Jan 7, 2018
d45d610
Make them be Rixian
Astn Jan 7, 2018
6bddda9
Change training mission player pilot to c_ptPlayer to allow for pig A…
Radulfr4 Jan 7, 2018
277114f
Added default CDKey in PigAccts.ini
BackTrak Jan 8, 2018
b4ade58
Defaulting pigaccts.ini to NOTSET for CDKey
BackTrak Jan 8, 2018
daad2eb
Remove accounts longer then 24 chars.
Astn Jan 8, 2018
cff10e0
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
Astn Jan 8, 2018
752405f
Now builds in FZRetail. This was needed so that it will run on the se…
BackTrak Jan 8, 2018
b04e33f
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 8, 2018
ffb8930
Don't change the mission name. That way we don't get kicked out for t…
Astn Jan 9, 2018
7829357
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
Astn Jan 9, 2018
bd5b237
updated to launch correct pigclient exe, added botbrawl zonegame map …
BackTrak Jan 9, 2018
5a3d83d
merging in changes from austin
BackTrak Jan 9, 2018
d785aad
Allow Bots to use guns with autopilot
Astn Jan 10, 2018
ebe1236
give pigs autopilot skills
Astn Jan 10, 2018
7c254ff
Changed debrisgeo behaviour
lanslans Jan 10, 2018
db6353c
Fixed +/- error
lanslans Jan 10, 2018
36f87fa
Updated game start logic in the pig scripts, fixed team join, fixed g…
BackTrak Jan 11, 2018
6dd0730
Changed how debris works
lanslans Jan 12, 2018
6f3519d
Pigs can now logoff.
Astn Jan 12, 2018
66a9387
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
Astn Jan 12, 2018
b7f7427
Set Pig to have wingman behavior if cdKey matches
Astn Jan 12, 2018
cc71b28
Fixing the bots crashing when a gunship was launched with a turret.
BackTrak Jan 12, 2018
01d8c4c
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 12, 2018
08ca641
Merge pull request #69 from lanslans/master
pvandommelen Jan 12, 2018
bcd8d9e
Changed debris density constants
lanslans Jan 12, 2018
202013e
Pig skills reset before a new game.
Astn Jan 13, 2018
31e061c
Merge pull request #70 from lanslans/master
pvandommelen Jan 13, 2018
bc21f77
old ui by default
pvandommelen Jan 13, 2018
a70a06c
Bug fix: Skills going over 1.0.
Astn Jan 13, 2018
842b648
Fixed a subtraction error
lanslans Jan 14, 2018
e1f5d90
Merge pull request #71 from lanslans/master
LordBlacksun Jan 14, 2018
6a9efa6
Bug: Don't crash if you pig.Game.Ships is null.
Astn Jan 14, 2018
34426d9
Fixing pigs not aquiring missile lock because they were not targeting…
BackTrak Jan 14, 2018
e11197b
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 14, 2018
764acfe
Moved registry settings from ATL CLSID Guid (module level) to Allegia…
BackTrak Jan 14, 2018
cbae631
Pigs use Iron Colition by default
Astn Jan 15, 2018
f36813b
Moving aaa.js to a seperate file, started working on typescript for i…
BackTrak Jan 15, 2018
46e53b1
Added most recent changes to aaa.js
BackTrak Jan 15, 2018
95a066a
Pigs: Update target every second.
Astn Jan 15, 2018
8e4e427
Merged current changes.
BackTrak Jan 15, 2018
21c060a
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Jan 15, 2018
3fdc19b
Removed texture packing. It was broken (haven't looked into why), but…
pvandommelen Jan 15, 2018
4a90ce9
Added visibility for Pigs so that they obey normal allegiance visibil…
BackTrak Jan 15, 2018
2060a64
Ensure that bots can always join the yellow team even if blocked by m…
BackTrak Jan 15, 2018
b4e9e99
Started working on the JSDoc generator
BackTrak Jan 16, 2018
71a5d64
fixing null exception crash when new pigs auto join
BackTrak Jan 16, 2018
b114eb0
Implement commander ELO
Xynth22 Jan 18, 2018
29c8653
Error fix
Xynth22 Jan 18, 2018
b744967
Bug fix
Xynth22 Jan 20, 2018
dcf4e4b
Merge pull request #72 from Radulfr4/TrainingII
pvandommelen Jan 25, 2018
7034ce1
Fix for insanely high scores
Xynth22 Jan 27, 2018
a5b1055
Merge branch 'master' of https://github.com/FreeAllegiance/Allegiance
Xynth22 Jan 27, 2018
0e41708
Real fix for the out of control points thing
Xynth22 Jan 29, 2018
eda06ac
Merge remote-tracking branch 'upstream/master'
BackTrak Jan 30, 2018
a43c66a
Merging FreeAllegiance\origin to PigWork
BackTrak Jan 30, 2018
c6c5ed3
Fixing null exception in AllSrv from latest FA merge.
BackTrak Feb 4, 2018
abc442d
Got a mostly working verison of the JSDocGenerator working, but still…
BackTrak Feb 5, 2018
75144f4
Reorganizing to enable TypeScript pigs.
BackTrak Feb 6, 2018
e010e18
Make it a easier to make it more enjoyable for new players.
Astn Feb 11, 2018
e6760e9
Still working on intellisens for pig scripts...
BackTrak Feb 26, 2018
1470468
Merge branch 'PigWork' of https://github.com/AllegianceZone/Allegianc…
BackTrak Feb 26, 2018
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,4 @@ $RECYCLE.BIN/

# Allow boost library
!src/Lib/boost/boost/preprocessor/debug
/src/Pigs/Piglets/Junk
316 changes: 313 additions & 3 deletions VS2017/Allegiance.sln

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions VS2017/Engine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
<ClCompile Include="..\src\engine\device3d.cpp" />
<ClCompile Include="..\src\engine\DeviceModesDX9.cpp" />
<ClCompile Include="..\src\engine\dinput.cpp" />
<ClCompile Include="..\src\engine\DX9PackFile.cpp" />
<ClCompile Include="..\src\engine\engine.cpp" />
<ClCompile Include="..\src\engine\engineapp.cpp" />
<ClCompile Include="..\src\engine\enginewindow.cpp" />
Expand Down Expand Up @@ -176,7 +175,6 @@
<ClInclude Include="..\src\engine\D3DDevice9.h" />
<ClInclude Include="..\src\engine\ddstruct.h" />
<ClInclude Include="..\src\engine\DeviceModesDX9.h" />
<ClInclude Include="..\src\engine\DX9PackFile.h" />
<ClInclude Include="..\src\engine\engine.h" />
<ClInclude Include="..\src\engine\engineapp.h" />
<ClInclude Include="..\src\engine\enginep.h" />
Expand Down
23 changes: 16 additions & 7 deletions VS2017/PigAccts.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<VcpkgConfiguration Condition="'$(Configuration)' == 'FZDebug'">Debug</VcpkgConfiguration>
<VcpkgConfiguration Condition="'$(Configuration)' == 'FZRetail'">Release</VcpkgConfiguration>
</PropertyGroup>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="FZDebug|Win32">
<Configuration>FZDebug</Configuration>
Expand All @@ -23,12 +23,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZDebug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZRetail|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -60,16 +60,21 @@
<AdditionalIncludeDirectories>..\src\Inc;..\src\Test\Inc;..\src\zlib;..\src\Guids;..\src\AGC;$(OutDir)..\PigsLib;$(OutDir)..\..\Guids;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PreprocessorDefinitions>NOMINMAX;_ATL_STATIC_REGISTRY;_VC80_UPGRADE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(OutDir)..\..\Test\TCLib\TCLib.lib;$(OutDir)..\PigGUID\PigGUID.lib;$(OutDir)..\..\Guids\AGCGuid.lib;$(OutDir)..\..\ZLib\ZLib.lib;lz32.lib;wininet.lib;netapi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\src\Lib\AllegianceSecurity\AllegianceSecurityd.lib;..\src\Lib\Steam\steam_api.lib;$(OutDir)..\..\Test\TCLib\TCLib.lib;$(OutDir)..\PigGUID\PigGUID.lib;$(OutDir)..\..\Guids\AGCGuid.lib;$(OutDir)..\..\ZLib\ZLib.lib;lz32.lib;wininet.lib;netapi32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>xcopy ..\src\lib\steam\steam_api.dll $(OutDir) /s /d /y
xcopy $(ProjectDir)..\src\Inc\steam_appid.txt $(OutDir) /s /d /y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FZDebug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\Inc;..\src\Test\Inc;..\src\zlib;..\src\Guids;..\src\AGC;$(OutDir)..\PigsLib;$(OutDir)..\..\Guids;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_ATL_STATIC_REGISTRY;_DEBUG;DEBUG;STRICT;_WINDOWS;WIN32;_AFXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\src\lib\Steam;..\src\Inc;..\src\Test\Inc;..\src\zlib;..\src\Guids;..\src\AGC;$(OutDir)..\PigsLib;$(OutDir)..\..\Guids;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_ATL_STATIC_REGISTRY;_DEBUG;DEBUG;STRICT;_WINDOWS;WIN32;_AFXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level2</WarningLevel>
Expand All @@ -79,8 +84,12 @@
<LanguageStandard>stdcpp14</LanguageStandard>
</ClCompile>
<Link>
<AdditionalDependencies>$(OutDir)..\..\Test\TCLib\TCLib.lib;$(OutDir)..\PigGUID\PigGUID.lib;$(OutDir)..\..\Guids\AGCGuid.lib;$(OutDir)..\..\ZLib\ZLib.lib;lz32.lib;wininet.lib;netapi32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\src\Lib\AllegianceSecurity\AllegianceSecurityd.lib;..\src\Lib\Steam\steam_api.lib;$(OutDir)..\..\Test\TCLib\TCLib.lib;$(OutDir)..\PigGUID\PigGUID.lib;$(OutDir)..\..\Guids\AGCGuid.lib;$(OutDir)..\..\ZLib\ZLib.lib;lz32.lib;wininet.lib;netapi32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>xcopy ..\src\lib\steam\steam_api.dll $(OutDir) /s /d /y
xcopy $(ProjectDir)..\src\Inc\steam_appid.txt $(OutDir) /s /d /y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\Pigs\PigAccts\pch.cpp">
Expand Down
14 changes: 9 additions & 5 deletions VS2017/PigConfig.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<VcpkgConfiguration Condition="'$(Configuration)' == 'FZDebug'">Debug</VcpkgConfiguration>
<VcpkgConfiguration Condition="'$(Configuration)' == 'FZRetail'">Release</VcpkgConfiguration>
</PropertyGroup>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="FZDebug|Win32">
<Configuration>FZDebug</Configuration>
Expand All @@ -23,12 +23,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZRetail|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZDebug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -59,7 +59,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\Pigs\PigConfig;..\src\Test\Inc;..\src\Inc;..\src\AGC;$(OutDir)..\..\Guids;$(OutDir)..\PigsLib;$(OutDir)..\..\Test\TCObj;..\src\Pigs\PigsLib;..\src\zlib;..\src\engine;..\src\Guids;..\src\Lobby;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_ATL_STATIC_REGISTRY;_DEBUG;DEBUG;STRICT;_WINDOWS;WIN32;_AFXDLL;_CRT_SECURE_NO_DEPRECATE;AGC_HOST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;_ATL_STATIC_REGISTRY;_DEBUG;DEBUG;STRICT;_WINDOWS;WIN32;_AFXDLL;_CRT_SECURE_NO_DEPRECATE;AGC_HOST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -86,7 +86,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PreprocessorDefinitions>_ATL_STATIC_REGISTRY;STRICT;_WINDOWS;WIN32;AGC_HOST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;_ATL_STATIC_REGISTRY;STRICT;_WINDOWS;WIN32;AGC_HOST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>FLAVOR="$(Configuration)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -96,6 +96,10 @@
<AdditionalDependencies>$(OutDir)..\PigGUID\PigGUID.lib;$(OutDir)..\..\Guids\AGCGuid.lib;$(OutDir)..\..\Test\TCLib\TCLib.lib;$(OutDir)..\..\ZLib\ZLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
<Command>xcopy ..\src\lib\steam\steam_api.dll $(OutDir) /s /d /y
xcopy $(ProjectDir)..\src\Inc\steam_appid.txt $(OutDir) /s /d /y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\Pigs\PigConfig\AboutDlg.cpp" />
Expand Down
5 changes: 3 additions & 2 deletions VS2017/PigGUID.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZRetail|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FZDebug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -64,6 +64,7 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LanguageStandard>stdcpp14</LanguageStandard>
<PreprocessorDefinitions>NOMINMAX;_VC80_UPGRADE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FZRetail|Win32'">
Expand Down
Loading