Fix MinGW compilation
Generate WinXP-compatible binaries for Release-Win32 build in VS2017 Strip unneeded code from precompiled cURL libraries
This commit is contained in:
parent
934840a141
commit
0404bd81a3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -910,7 +910,7 @@ typedef struct zonedebug_s {
|
|||
int allocSize;
|
||||
} zonedebug_t;
|
||||
|
||||
typedef struct memzone_s;
|
||||
struct memzone_s;
|
||||
|
||||
typedef struct memblock_s {
|
||||
int size; // including the header and possibly tiny fragments
|
||||
|
|
|
@ -963,16 +963,16 @@ temp file loading
|
|||
#define Z_TagMalloc(size, tag) Z_TagMallocDebug(size, tag, #size, __FILE__, __LINE__)
|
||||
#define Z_Malloc(size) Z_MallocDebug(size, #size, __FILE__, __LINE__)
|
||||
#define S_Malloc(size) S_MallocDebug(size, #size, __FILE__, __LINE__)
|
||||
void *Z_TagMallocDebug( int size, int tag, char *label, char *file, int line ); // NOT 0 filled memory
|
||||
void *Z_TagMallocDebug( int size, memtag_t tag, char *label, char *file, int line ); // NOT 0 filled memory
|
||||
void *Z_MallocDebug( int size, char *label, char *file, int line ); // returns 0 filled memory
|
||||
void *S_MallocDebug( int size, char *label, char *file, int line ); // returns 0 filled memory
|
||||
#else
|
||||
void *Z_TagMalloc( int size, int tag ); // NOT 0 filled memory
|
||||
void *Z_TagMalloc( int size, memtag_t tag ); // NOT 0 filled memory
|
||||
void *Z_Malloc( int size ); // returns 0 filled memory
|
||||
void *S_Malloc( int size ); // NOT 0 filled memory only for small allocations
|
||||
#endif
|
||||
void Z_Free( void *ptr );
|
||||
void Z_FreeTags( int tag );
|
||||
void Z_FreeTags( memtag_t tag );
|
||||
int Z_AvailableMemory( void );
|
||||
void Z_LogHeap( void );
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v141_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
|
@ -70,6 +70,7 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>.\output\</OutDir>
|
||||
<IntDir>.\build\quake3ded_release\</IntDir>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<OutDir>.\output\</OutDir>
|
||||
|
@ -144,7 +145,6 @@
|
|||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalOptions>/DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalDependencies>advapi32.lib;gdi32.lib;user32.lib;comctl32.lib;winmm.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)quake3e.ded.exe</OutputFile>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
|
@ -153,6 +153,7 @@
|
|||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<SetChecksum>true</SetChecksum>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<PlatformToolset>v141_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
|
@ -69,6 +69,7 @@
|
|||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>.\output\</OutDir>
|
||||
<IntDir>.\build\quake3e_release\</IntDir>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<OutDir>.\output\</OutDir>
|
||||
|
@ -146,7 +147,6 @@
|
|||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalOptions>/DYNAMICBASE %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalDependencies>comctl32.lib;winmm.lib;wsock32.lib;ws2_32.lib;wldap32.lib;..\..\libcurl\windows\vs2017\lib32\libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)quake3e.exe</OutputFile>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
|
@ -157,6 +157,7 @@
|
|||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<FixedBaseAddress>false</FixedBaseAddress>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
Loading…
Reference in New Issue