Merged win2k build into release build

This commit is contained in:
NovaRain
2021-06-06 09:45:36 +08:00
parent fddeb72e9d
commit 489de55330
3 changed files with 29 additions and 82 deletions
+1 -4
View File
@@ -1,21 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "int2ssl", "int2ssl.vcxproj", "{111A0D20-3404-449D-A984-73C3D9A001E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Win2K|Win32 = Win2K|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{111A0D20-3404-449D-A984-73C3D9A001E1}.Debug|Win32.ActiveCfg = Debug|Win32
{111A0D20-3404-449D-A984-73C3D9A001E1}.Debug|Win32.Build.0 = Debug|Win32
{111A0D20-3404-449D-A984-73C3D9A001E1}.Release|Win32.ActiveCfg = Release|Win32
{111A0D20-3404-449D-A984-73C3D9A001E1}.Release|Win32.Build.0 = Release|Win32
{111A0D20-3404-449D-A984-73C3D9A001E1}.Win2K|Win32.ActiveCfg = Win2K|Win32
{111A0D20-3404-449D-A984-73C3D9A001E1}.Win2K|Win32.Build.0 = Win2K|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+1 -52
View File
@@ -9,10 +9,6 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Win2K|Win32">
<Configuration>Win2K</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{111A0D20-3404-449D-A984-73C3D9A001E1}</ProjectGuid>
@@ -32,13 +28,6 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win2K|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
@@ -49,9 +38,6 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win2K|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>Debug\</OutDir>
@@ -63,19 +49,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>Release\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win2K|Win32'">
<OutDir>Win2K\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>Release\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win2K|Win32'">
<IntDir>Win2K\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -122,35 +100,7 @@
<TargetMachine>MachineX86</TargetMachine>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalDependencies>kernel32.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win2K|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>$(TargetPath)</OutputFile>
<SubSystem>Console</SubSystem>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalDependencies>kernel32.lib</AdditionalDependencies>
<MinimumRequiredVersion>5.0</MinimumRequiredVersion>
<MinimumRequiredVersion>5.00</MinimumRequiredVersion>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -185,7 +135,6 @@
<ItemGroup>
<MASM Include="win2kcompat.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</MASM>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+27 -26
View File
@@ -1,24 +1,26 @@
^ - These functions require AllowUnsafeScripting to be enabled in ddraw.ini
0x8156 - int read_byte(int address)
0x8157 - int read_short(int address)
0x8158 - int read_int(int address)
0x8159 - string read_string(int address)
*0x81cf - void write_byte(int address, int value)
*0x81d0 - void write_short(int address, int value)
*0x81d1 - void write_int(int address, int value)
*0x821b - void write_string(int address, string value)
^ 0x81cf - void write_byte(int address, int value)
^ 0x81d0 - void write_short(int address, int value)
^ 0x81d1 - void write_int(int address, int value)
^ 0x821b - void write_string(int address, string value)
*0x81d2 - void call_offset_v0(int address)
*0x81d3 - void call_offset_v1(int address, int arg1)
*0x81d4 - void call_offset_v2(int address, int arg1, int arg2)
*0x81d5 - void call_offset_v3(int address, int arg1, int arg2, int arg3)
*0x81d6 - void call_offset_v4(int address, int arg1, int arg2, int arg3, int arg4)
*0x81d7 - int call_offset_r0(int address)
*0x81d8 - int call_offset_r1(int address, int arg1)
*0x81d9 - int call_offset_r2(int address, int arg1, int arg2)
*0x81da - int call_offset_r3(int address, int arg1, int arg2, int arg3)
*0x81db - int call_offset_r4(int address, int arg1, int arg2, int arg3, int arg4)
^ 0x81d2 - void call_offset_v0(int address)
^ 0x81d3 - void call_offset_v1(int address, int arg1)
^ 0x81d4 - void call_offset_v2(int address, int arg1, int arg2)
^ 0x81d5 - void call_offset_v3(int address, int arg1, int arg2, int arg3)
^ 0x81d6 - void call_offset_v4(int address, int arg1, int arg2, int arg3, int arg4)
^ 0x81d7 - int call_offset_r0(int address)
^ 0x81d8 - int call_offset_r1(int address, int arg1)
^ 0x81d9 - int call_offset_r2(int address, int arg1, int arg2)
^ 0x81da - int call_offset_r3(int address, int arg1, int arg2, int arg3)
^ 0x81db - int call_offset_r4(int address, int arg1, int arg2, int arg3, int arg4)
0x815a - void set_pc_base_stat(int StatID, int value)
0x815b - void set_pc_extra_stat(int StatID, int value)
@@ -192,7 +194,7 @@
0x8225 - void remove_trait(int traitID)
0x81cb - void set_pyromaniac_mod(int bonus)
0x81cc - void apply_heaveho_fix
0x81cc - void apply_heaveho_fix()
0x81cd - void set_swiftlearner_mod(int bonus)
0x81ce - void set_hp_per_level_mod(int mod)
@@ -292,12 +294,12 @@
0x8226 - int get_light_level()
0x8227 - void refresh_pc_art
0x8227 - void refresh_pc_art()
0x8228 - int get_attack_type
0x8228 - int get_attack_type()
0x822b - int play_sfall_sound(string file, int loop)
0x822c - void stop_sfall_sound(int ptr)
0x822b - int play_sfall_sound(string file, int mode)
0x822c - void stop_sfall_sound(int soundID)
0x8235 - array string_split(string string, string split)
0x8237 - int atoi(string string)
@@ -321,9 +323,9 @@
0x8249 - object get_last_attacker(object critter)
0x824a - void block_combat(int enable)
0x824b - int tile_under_cursor
0x824c - int gdialog_get_barter_mod
0x824d - void set_inven_ap_cost
0x824b - int tile_under_cursor()
0x824c - int gdialog_get_barter_mod()
0x824d - void set_inven_ap_cost()
0x825c - void reg_anim_combat_check(int enable)
0x825a - void reg_anim_destroy(object object)
@@ -338,7 +340,7 @@
0x8262 - void register_hook_proc(int hook, procedure proc)
0x826b - string message_str_game(int fileId, int messageId)
0x826c - int sneak_success
0x826c - int sneak_success()
0x826d - int tile_light(int elevation, int tileNum)
0x826e - object obj_blocking_line(object objFrom, int tileTo, int blockingType)
0x826f - object obj_blocking_tile(int tileNum, int elevation, int blockingType)
@@ -362,6 +364,5 @@
0x827f - div operator (unsigned integer division)
* These functions require AllowUnsafeScripting to be enabled in ddraw.ini
0x8280 - any sfall_func7(string funcName, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
0x8281 - any sfall_func8(string funcName, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8)