* 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
This commit is contained in:
Xanadu committed 2010-06-23 01:47:41 +02:00
1 parent 27062ffd61
commit ffaffe3fd7
37 files changed
+867 -821

No files matched your search

+2 -2
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 );
@@ -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"
+1 -1
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;