mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
*** Merged Code from Multiplayer Branch Revision 2960 ***
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-) - Multiplayer Version 1.1 + some additional features and bugfixes * INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory * git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+16
-8
@@ -18,8 +18,8 @@
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="\games\jagged alliance 2"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
OutputDirectory="C:\games\jagged alliance 2 EN"
|
||||
IntermediateDirectory="build\VS2008\$(ProjectName)_$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Debug.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -62,10 +62,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
|
||||
OutputFile="$(OutDir)\JA2_EN_Debug_2949.exe"
|
||||
OutputFile="$(OutDir)\JA2_EN_Debug.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="Multiplayer\raknet"
|
||||
IgnoreDefaultLibraryNames=""
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
RandomizedBaseAddress="1"
|
||||
@@ -96,7 +96,7 @@
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="\games\jagged alliance 2"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
IntermediateDirectory="build\VS2008\$(ProjectName)_$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -141,7 +141,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
|
||||
OutputFile="$(OutDir)\JA2_EN_Release_2949.exe"
|
||||
OutputFile="$(OutDir)\JA2_MP_EN_v1.1.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="Multiplayer\raknet"
|
||||
GenerateDebugInformation="false"
|
||||
@@ -176,7 +176,7 @@
|
||||
<Configuration
|
||||
Name="MapEditor|Win32"
|
||||
OutputDirectory="\games\jagged alliance 2"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
IntermediateDirectory="build\VS2008\$(ProjectName)_$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops;.\ja2_VS2008Editor.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -256,7 +256,7 @@
|
||||
<Configuration
|
||||
Name="MapEditorD|Win32"
|
||||
OutputDirectory="\games\jagged alliance 2"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
IntermediateDirectory="build\VS2008\$(ProjectName)_$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops;.\ja2_VS2008Editor.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -439,6 +439,10 @@
|
||||
RelativePath=".\MPChatScreen.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\MPConnectScreen.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\MPHostScreen.h"
|
||||
>
|
||||
@@ -617,6 +621,10 @@
|
||||
RelativePath=".\MPChatScreen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\MPConnectScreen.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\MPHostScreen.cpp"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user