Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 21:02:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Renamed several VS projects and the executables they produce to reflect the new naming convention.

Browse Source 
* Cleaned up some useless and redundant preprocessor definitions.
* Fixed the win build so that it correctly uses the mysql lib it built from the sources.
* Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries.
* Also note that Win x64 build from the existing VS files is still fubar (mysql lib...).

--HG--
branch : trunk
This commit is contained in:
Xanadu
2010-06-23 01:47:41 +02:00
parent 27062ffd61
commit ffaffe3fd7
37 changed files with 867 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/authserver/Main.cpp
View File

@@ -45,7 +45,7 @@
# define _TRINITY_REALM_CONFIG "authserver.conf"
#endif //_TRINITY_REALM_CONFIG
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "TrinityRealm";
char serviceLongName[] = "Trinity realm service";
@@ -92,7 +92,7 @@ void usage(const char *prog)
{
sLog.outString("Usage: \n %s [<options>]\n"
" -c config_file use config_file as configuration file\n\r"
#ifdef WIN32
#ifdef _WIN32
" Running as service functions:\n\r"
" --service run as service\n\r"
" -s install install service\n\r"
@@ -122,7 +122,7 @@ extern int main(int argc, char **argv)
cfg_file = argv[c];
}
#ifdef WIN32
#ifdef _WIN32
////////////
//Services//
////////////
@@ -243,7 +243,7 @@ extern int main(int argc, char **argv)
#endif /* _WIN32 */();
///- Handle affinity for multiple processors and process priority on Windows
#ifdef WIN32
#ifdef _WIN32
{
HANDLE hProcess = GetCurrentProcess();
@@ -315,7 +315,7 @@ extern int main(int argc, char **argv)
sLog.outDetail("Ping MySQL to keep connection alive");
LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
}
#ifdef WIN32
#ifdef _WIN32
if (m_ServiceStatus == 0) stopEvent = true;
while (m_ServiceStatus == 2) Sleep(1000);
#endif

2
src/server/game/PrecompiledHeaders/ScriptPCH.h
View File

@@ -23,7 +23,7 @@
#include "DBCStores.h"
#include "ObjectMgr.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#endif

2
src/server/game/Scripting/ScriptLoader.cpp
View File

@@ -16,7 +16,7 @@
#include "ScriptPCH.h"
#ifdef WIN32
#ifdef _WIN32
#define DO_SCRIPTS
#endif

4
src/server/game/Spells/Spell.h
View File

@@ -769,14 +769,14 @@ namespace Trinity
}
}
#ifdef WIN32
#ifdef _WIN32
template<> inline void Visit(CorpseMapType &) {}
template<> inline void Visit(GameObjectMapType &) {}
template<> inline void Visit(DynamicObjectMapType &) {}
#endif
};
#ifndef WIN32
#ifndef _WIN32
template<> inline void SpellNotifierCreatureAndPlayer::Visit(CorpseMapType&) {}
template<> inline void SpellNotifierCreatureAndPlayer::Visit(GameObjectMapType&) {}
template<> inline void SpellNotifierCreatureAndPlayer::Visit(DynamicObjectMapType&) {}

2
src/server/shared/CompilerDefs.h
View File

@@ -26,7 +26,7 @@
#define PLATFORM_APPLE 2
#define PLATFORM_INTEL 3
// must be first (win 64 also define WIN32)
// must be first (win 64 also define _WIN32)
#if defined( _WIN64 )
# define PLATFORM PLATFORM_WINDOWS
#elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )

2
src/server/shared/Database/Database.cpp
View File

@@ -113,7 +113,7 @@ bool Database::Initialize(const char *infoString)
database = *iter++;
mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
#ifdef WIN32
#ifdef _WIN32
if (host==".") // named pipe use option (Windows)
{
unsigned int opt = MYSQL_PROTOCOL_PIPE;

2
src/server/shared/Database/Database.h
View File

@@ -28,7 +28,7 @@
#include "ace/Thread_Mutex.h"
#include "ace/Guard_T.h"
#ifdef WIN32
#ifdef _WIN32
#define FD_SETSIZE 1024
#include <winsock2.h>
#include <mysql/mysql.h>

2
src/server/shared/Database/QueryResult.h
View File

@@ -26,7 +26,7 @@
#include "Field.h"
#ifdef WIN32
#ifdef _WIN32
#define FD_SETSIZE 1024
#include <winsock2.h>
#include <mysql/mysql.h>

2
src/server/shared/Utilities/ServiceWin32.cpp
View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef WIN32
#ifdef _WIN32
#include "Common.h"
#include "Log.h"

4
src/server/shared/Utilities/ServiceWin32.h
View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef WIN32
#ifdef _WIN32
#ifndef _WIN32_SERVICE_
#define _WIN32_SERVICE_
@@ -27,5 +27,5 @@ bool WinServiceUninstall();
bool WinServiceRun();
#endif // _WIN32_SERVICE_
#endif // WIN32
#endif // _WIN32

2
src/server/shared/Utilities/Util.cpp
View File

@@ -195,7 +195,7 @@ uint32 CreatePIDFile(const std::string& filename)
if (pid_file == NULL)
return 0;
#ifdef WIN32
#ifdef _WIN32
DWORD pid = GetCurrentProcessId();
#else
pid_t pid = getpid();

6
src/server/worldserver/Main.cpp
View File

@@ -37,7 +37,7 @@
# define _TRINITY_CORE_CONFIG "worldserver.conf"
#endif //_TRINITY_CORE_CONFIG
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "TrinityCore";
char serviceLongName[] = "Trinity core service";
@@ -62,7 +62,7 @@ void usage(const char *prog)
{
sLog.outString("Usage: \n %s [<options>]\n"
" -c config_file use config_file as configuration file\n\r"
#ifdef WIN32
#ifdef _WIN32
" Running as service functions:\n\r"
" --service run as service\n\r"
" -s install install service\n\r"
@@ -91,7 +91,7 @@ extern int main(int argc, char **argv)
cfg_file = argv[c];
}
#ifdef WIN32
#ifdef _WIN32
////////////
//Services//
////////////

8
src/server/worldserver/Master.cpp
View File

@@ -50,7 +50,7 @@
#include "ListenSocket.h"
#include "BigNumber.h"
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
extern int m_ServiceStatus;
#endif
@@ -285,7 +285,7 @@ int Master::Run()
ACE_Based::Thread* cliThread = NULL;
#ifdef WIN32
#ifdef _WIN32
if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
#else
if (sConfig.GetBoolDefault("Console.Enable", true))
@@ -298,7 +298,7 @@ int Master::Run()
ACE_Based::Thread rar_thread(new RARunnable);
///- Handle affinity for multiple processors and process priority on Windows
#ifdef WIN32
#ifdef _WIN32
{
HANDLE hProcess = GetCurrentProcess();
@@ -386,7 +386,7 @@ int Master::Run()
if (cliThread)
{
#ifdef WIN32
#ifdef _WIN32
// this only way to terminate CLI thread exist at Win32 (alt. way exist only in Windows Vista API)
//_exit(1);

4
src/server/worldserver/WorldThread/WorldRunnable.cpp
View File

@@ -35,7 +35,7 @@
#define WORLD_SLEEP_CONST 50
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
extern int m_ServiceStatus;
#endif
@@ -76,7 +76,7 @@ void WorldRunnable::run()
else
prevSleepTime = 0;
#ifdef WIN32
#ifdef _WIN32
if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
while (m_ServiceStatus == 2) Sleep(1000);
#endif

54
src/tools/ExtractorToolsVC90.sln
View File

@@ -1,21 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
ProjectSection(ProjectDependencies) = postProject
{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
ProjectSection(ProjectDependencies) = postProject
{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
ProjectSection(ProjectDependencies) = postProject
{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}"
ProjectSection(ProjectDependencies) = postProject
{CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1}
@@ -33,24 +18,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapextractor", "map_extractor\VC90\VC90_mapextractor.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
ProjectSection(ProjectDependencies) = postProject
{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3assembler", "vmap3_assembler\VC90\VC90_vmap3assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}"
ProjectSection(ProjectDependencies) = postProject
{8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3extractor", "vmap3_extractor\VC90\VC90_vmap3extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}"
ProjectSection(ProjectDependencies) = postProject
{03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32
{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32
{03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32
@@ -67,6 +55,18 @@ Global
{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32
{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32
{8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32
{572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.ActiveCfg = Debug|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32
{502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

4
src/tools/map_extractor/System.cpp
View File

@@ -5,7 +5,7 @@
#include <set>
#include <cstdlib>
#ifdef WIN32
#ifdef _WIN32
#include "direct.h"
#else
#include <sys/stat.h>
@@ -88,7 +88,7 @@ static char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "z
void CreateDir( const std::string& Path )
{
#ifdef WIN32
#ifdef _WIN32
_mkdir( Path.c_str());
#else
mkdir( Path.c_str(), 0777 );

17
src/tools/map_extractor/VC90/VC90_ad.vcproj → src/tools/map_extractor/VC90/VC90_mapextractor.vcproj
View File

@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="ad"
Name="mapextractor"
ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
RootNamespace="ad"
TargetFrameworkVersion="131072"
@@ -49,7 +49,6 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -57,8 +56,8 @@
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\ad.pch"
AssemblerListingLocation=""
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
XMLDocumentationFileName="$(IntDir)\"
BrowseInformation="0"
BrowseInformationFile=""
@@ -149,7 +148,6 @@
Optimization="2"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -157,12 +155,13 @@
UsePrecompiledHeader="0"
PrecompiledHeaderFile=""
AssemblerListingLocation=""
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
XMLDocumentationFileName="$(IntDir)\"
BrowseInformation="0"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -182,8 +181,8 @@
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="false"
ProgramDatabaseFile=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

2
src/tools/map_extractor/loadlib/loadlib.h
View File

@@ -1,7 +1,7 @@
#ifndef LOAD_LIB_H
#define LOAD_LIB_H
#ifdef WIN32
#ifdef _WIN32
typedef __int64 int64;
typedef long int32;
typedef short int16;

13
src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj → src/tools/vmap3_assembler/VC90/VC90_vmap3assembler.vcproj
View File

@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="vmap_assembler"
Name="vmap3assembler"
ProjectGUID="{572FFF74-480C-4472-8ABF-81733BB4049D}"
RootNamespace="vmap_assembler"
Keyword="Win32Proj"
@@ -43,13 +43,14 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
UsePrecompiledHeader="0"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
@@ -125,15 +126,16 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -150,7 +152,8 @@
LinkIncremental="1"
AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="false"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

15
src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj → src/tools/vmap3_extractor/VC90/VC90_vmap3extractor.vcproj
View File

@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="vmap3_extractor"
Name="vmap3extractor"
ProjectGUID="{502602CC-98EA-4335-B922-C5C1DBF37604}"
RootNamespace="vmap3_extractor"
Keyword="Win32Proj"
@@ -42,12 +42,14 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
DebugInformationFormat="3"
/>
@@ -123,14 +125,16 @@
EnableIntrinsicFunctions="false"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0"
ObjectFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
ProgramDataBaseFileName=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
WarningLevel="3"
DebugInformationFormat="0"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -146,7 +150,8 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""
GenerateDebugInformation="false"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

2
src/tools/vmap3_extractor/adtfile.cpp
View File

@@ -4,7 +4,7 @@
#include <algorithm>
#include <cstdio>
#ifdef WIN32
#ifdef _WIN32
#define snprintf _snprintf
#endif

2
src/tools/vmap3_extractor/loadlib/loadlib.h
View File

@@ -1,7 +1,7 @@
#ifndef LOAD_LIB_H
#define LOAD_LIB_H
#ifdef WIN32
#ifdef _WIN32
typedef __int64 int64;
typedef __int32 int32;
typedef __int16 int16;

3
src/tools/vmap3_extractor/mpq_libmpq04.h
View File

@@ -1,6 +1,3 @@
#define _CRT_SECURE_NO_DEPRECATE
#define _CRT_SECURE_NO_WARNINGS
#ifndef MPQ_H
#define MPQ_H

2
src/tools/vmap3_extractor/vmapexport.cpp
View File

@@ -5,7 +5,7 @@
#include <list>
#include <errno.h>
#ifdef WIN32
#ifdef _WIN32
#include <Windows.h>
#include <sys/stat.h>
#include <direct.h>