diff options
| author | Xanadu <none@none> | 2010-06-23 01:47:41 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-06-23 01:47:41 +0200 |
| commit | ffaffe3fd753b0afc75679c9730276871a9d034a (patch) | |
| tree | f51f59797532a307b6f8f426fd22e593c4418070 /src/tools/map_extractor | |
| parent | 27062ffd6173b0ea1181353eeade6935e355e351 (diff) | |
* Renamed several VS projects and the executables they produce to reflect the new naming convention.
* 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
Diffstat (limited to 'src/tools/map_extractor')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 4 | ||||
| -rw-r--r-- | src/tools/map_extractor/VC90/VC90_mapextractor.vcproj (renamed from src/tools/map_extractor/VC90/VC90_ad.vcproj) | 17 | ||||
| -rw-r--r-- | src/tools/map_extractor/loadlib/loadlib.h | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 6abe2364cd6..3a328e91bf4 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -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 ); diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj index e875137556c..c943d93d84e 100644 --- a/src/tools/map_extractor/VC90/VC90_ad.vcproj +++ b/src/tools/map_extractor/VC90/VC90_mapextractor.vcproj @@ -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" diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h index 6acfd107ec7..48fe794f8dc 100644 --- a/src/tools/map_extractor/loadlib/loadlib.h +++ b/src/tools/map_extractor/loadlib/loadlib.h @@ -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; |