From 9f78139605fefc1db24462e9660d6df1d61336ee Mon Sep 17 00:00:00 2001 From: shlainn Date: Sun, 9 Oct 2011 11:38:03 +0200 Subject: [PATCH] * Fix Windows Build Curse you, case-insensitive OS! Locale.h != locale.h !!! --- src/shared/CMakeLists.txt | 2 +- src/shared/MPQHelper.cpp | 2 +- src/shared/{Locale.cpp => MPQLocale.cpp} | 2 +- src/shared/{Locale.h => MPQLocale.h} | 0 src/shared/MemoryDataHolder.cpp | 2 +- src/tools/stuffextract/StuffExtract.cpp | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename src/shared/{Locale.cpp => MPQLocale.cpp} (98%) rename src/shared/{Locale.h => MPQLocale.h} (100%) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index c55a329..ec3e4c0 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/dep/include ${PROJECT_SOURCE_DIR}/src/dep/src ${PROJECT_SOURCE_DIR}/src/shared) add_library(shared WDTFile.cpp -Locale.cpp +MPQLocale.cpp MPQFile.cpp MPQHelper.cpp ProgressBar.cpp diff --git a/src/shared/MPQHelper.cpp b/src/shared/MPQHelper.cpp index cd8beb9..cee8d9e 100644 --- a/src/shared/MPQHelper.cpp +++ b/src/shared/MPQHelper.cpp @@ -2,7 +2,7 @@ #include "common.h" #include "MPQHelper.h" #include "MPQFile.h" -#include "Locale.h" +#include "MPQLocale.h" #define DATADIR "Data" diff --git a/src/shared/Locale.cpp b/src/shared/MPQLocale.cpp similarity index 98% rename from src/shared/Locale.cpp rename to src/shared/MPQLocale.cpp index 6c661df..46b4392 100644 --- a/src/shared/Locale.cpp +++ b/src/shared/MPQLocale.cpp @@ -1,5 +1,5 @@ #include "common.h" -#include "Locale.h" +#include "MPQLocale.h" #include #include "ByteBuffer.h" diff --git a/src/shared/Locale.h b/src/shared/MPQLocale.h similarity index 100% rename from src/shared/Locale.h rename to src/shared/MPQLocale.h diff --git a/src/shared/MemoryDataHolder.cpp b/src/shared/MemoryDataHolder.cpp index a2c9dd4..75a77b8 100644 --- a/src/shared/MemoryDataHolder.cpp +++ b/src/shared/MemoryDataHolder.cpp @@ -5,7 +5,7 @@ #include "zthread/Task.h" #include "zthread/PoolExecutor.h" #include "MPQHelper.h" -#include "Locale.h" +#include "MPQLocale.h" #include "tools.h" namespace MemoryDataHolder diff --git a/src/tools/stuffextract/StuffExtract.cpp b/src/tools/stuffextract/StuffExtract.cpp index 0d66bc8..8c5f89d 100644 --- a/src/tools/stuffextract/StuffExtract.cpp +++ b/src/tools/stuffextract/StuffExtract.cpp @@ -10,7 +10,7 @@ #include "WDTFile.h" #include "StuffExtract.h" #include "DBCFieldData.h" -#include "Locale.h" +#include "MPQLocale.h" #include "ProgressBar.h" #include "../../Client/GUI/CM2MeshFileLoader.h" #include "../../Client/GUI/CWMOMeshFileLoader.h"