Skip to content

Commit 12d1885

Browse files
softcodersoftcoder
committed
- ported bugfixes to trunk from 3.6.0.3
2 parents fbf7610 + ebe45d2 commit 12d1885

File tree

11 files changed

+55
-26
lines changed

11 files changed

+55
-26
lines changed

‎build-mg-win32.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
44

5+
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
56
mkdir -p build-win32
67
cd build-win32
78

8-
cmake -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-mingw32.cmake -DXERCESC_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include -DXERCESC_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib -DXERCESC_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib/libxerces-c2_8_0.dll -DOPENAL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854 -DOPENAL_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/OpenAL32.dll -DOGG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include -DOGG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libogg.dll -DVORBIS_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libvorbis.dll -DVORBIS_FILE_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libvorbisfile.dll -DLUA_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src -DLUA_LIBRARIES=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/lua5.1.dll -DJPEG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b -DJPEG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libjpeg.dll -DZLIB_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5 -DZLIB_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libz.a -DPNG_PNG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141 -DPNG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libpng.dll -DCURL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include -DCURL_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/libs/libcurl.dll -DSDL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include -DCMAKE_INSTALL_PREFIX= -DMINIUPNPC_VERSION_PRE1_6=ON -DWANT_STATIC_LIBS=ON ..
9+
cmake -DCMAKE_TOOLCHAIN_FILE=../mk/cmake/Modules/Toolchain-mingw32.cmake -DXERCESC_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/include -DXERCESC_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib -DXERCESC_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib/libxerces-c2_8_0.dll -DOPENAL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854 -DOPENAL_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/OpenAL32.dll -DOGG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/libogg-1.2.1/include -DOGG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libogg.dll -DVORBIS_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libvorbis.dll -DVORBIS_FILE_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libvorbisfile.dll -DLUA_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/lua-5.1/src -DLUA_LIBRARIES=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/lua5.1.dll -DJPEG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/jpeg-8b -DJPEG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libjpeg.dll -DZLIB_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5 -DZLIB_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libz.a -DPNG_PNG_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/lpng141 -DPNG_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libpng.dll -DCURL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include -DCURL_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libcurl.dll -DSDL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/SDL-1.2.x/include -DFREETYPE_INCLUDE_DIR_ft2build=${PROJECT_SOURCE_DIR}/source/win32_deps/freetype-2.4.8/include -DFREETYPE_INCLUDE_DIR_freetype2=${PROJECT_SOURCE_DIR}/source/win32_deps/freetype-2.4.8/include/freetype -DFREETYPE_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libfreetype-6.dll -DFTGL_INCLUDE_DIR=${PROJECT_SOURCE_DIR}/source/win32_deps/ftgl-2.1.3~rc5/src -DFTGL_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/libftgl.a -DGLEW_INCLUDE_PATH=${PROJECT_SOURCE_DIR}/source/win32_deps/glew-1.7.0/include -DGLEW_LIBRARY=${PROJECT_SOURCE_DIR}/source/win32_deps/lib/glew32.dll -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON ..
910

1011
make -j$NUMCORES
1112

‎mk/linux/mg-version.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
55
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
66

7-
OLD_MG_VERSION=3.6.0.1
8-
OLD_MG_VERSION_BINARY=3.6.0
7+
OLD_MG_VERSION=3.6.0.2
8+
OLD_MG_VERSION_BINARY=3.6.0.2
99
#MG_VERSION=3.6.1-dev
10-
MG_VERSION=3.6.0.2
10+
MG_VERSION=3.6.0.3
1111

1212
if [ "$1" = "--oldversion" ]; then
1313
echo "$OLD_MG_VERSION"

‎mk/windoze/CopyWindowsRuntimeDlls.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
rem if not exist ..\..\data\glest_game\dsound.dll copy dsound.dll ..\..\data\glest_game\
44
if not exist ..\..\data\glest_game\xerces-c_3_0.dll copy ..\..\source\win32_deps\bin\xerces-c_3_0.dll ..\..\data\glest_game\
5+
if not exist ..\..\data\glest_game\openal32.dll copy ..\..\source\win32_deps\bin\openal32.dll ..\..\data\glest_game\
56

67
if not "%1" == "nopause" pause

‎source/glest_game/global/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Config::Config(std::pair<ConfigType,ConfigType> type, std::pair<string,string> f
147147

148148
#if defined(CUSTOM_DATA_INSTALL_PATH)
149149
if(foundPath == false) {
150-
foundPath = tryCustomPath(cfgType, fileName, TOSTRING(CUSTOM_DATA_INSTALL_PATH));
150+
foundPath = tryCustomPath(cfgType, fileName, formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH)));
151151
}
152152
#endif
153153

‎source/glest_game/main/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2441,7 +2441,7 @@ int glestMain(int argc, char** argv) {
24412441

24422442

24432443
#if defined(CUSTOM_DATA_INSTALL_PATH)
2444-
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\n\nCUSTOM_DATA_INSTALL_PATH = [%s]\n\n",TOSTRING(CUSTOM_DATA_INSTALL_PATH));
2444+
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\n\nCUSTOM_DATA_INSTALL_PATH = [%s]\n\n",formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH)).c_str());
24452445
#endif
24462446

24472447
const int knownArgCount = sizeof(GAME_ARGS) / sizeof(GAME_ARGS[0]);

‎source/shared_lib/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,30 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
293293
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY})
294294
endif()
295295

296+
set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}")
297+
set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}")
298+
check_cxx_source_runs("
299+
#include <stdio.h>
300+
#include <stdlib.h>
301+
#include <libircclient.h>
302+
int main()
303+
{
304+
unsigned int high = 0;
305+
unsigned int low = 0;
306+
irc_get_version(&high,&low);
307+
if( (high == 1 && low >= 6) || (high > 1)) {
308+
return 0;
309+
}
310+
throw 1;
311+
}"
312+
HAS_LIBIRCCLIENT_1_6)
313+
314+
IF(HAS_LIBIRCCLIENT_1_6)
315+
message(STATUS "Found HAS_LIBIRCCLIENT_1_6: ${HAS_LIBIRCCLIENT_1_6}")
316+
ELSE()
317+
ADD_DEFINITIONS(-DLIBIRCCLIENT_PRE1_6)
318+
ENDIF()
319+
296320
IF(WIN32)
297321
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/socket.cpp)
298322
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/ircclient.cpp)

‎source/shared_lib/include/platform/common/platform_common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ bool EndsWith(const string &str, const string& key);
211211
void endPathWithSlash(string &path, bool requireOSSlash=false);
212212
void trimPathWithStartingSlash(string &path);
213213
void updatePathClimbingParts(string &path);
214+
string formatPath(string path);
214215

215216
string replaceAll(string& context, const string& from, const string& to);
216217
bool removeFile(string file);

‎source/shared_lib/sources/platform/common/platform_common.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,13 @@ void endPathWithSlash(string &path,bool requireOSSlash) {
500500
}
501501
}
502502

503+
string formatPath(string path) {
504+
replaceAll(path, "\"", "");
505+
replaceAll(path, "//", "/");
506+
507+
return path;
508+
}
509+
503510
void trimPathWithStartingSlash(string &path) {
504511
if(StartsWith(path, "/") == true || StartsWith(path, "\\") == true) {
505512
path.erase(path.begin(),path.begin()+1);

‎source/shared_lib/sources/platform/posix/ircclient.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
#include "platform_common.h"
1616
#include "libircclient.h"
1717

18+
// upstream moved some defines into new headers as of 1.6
19+
#ifndef LIBIRCCLIENT_PRE1_6
20+
#include "libirc_rfcnumeric.h"
21+
#endif
22+
1823
#include <stdio.h>
1924
#include <stdarg.h>
2025
#include <string.h>

‎source/shared_lib/sources/platform/sdl/gl_wrap.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ void PlatformContextGl::init(int colorBits, int depthBits, int stencilBits,
7979
#ifndef WIN32
8080
string mg_icon_file = "";
8181
#if defined(CUSTOM_DATA_INSTALL_PATH_VALUE)
82-
if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png")) {
83-
mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.png";
82+
if(fileExists(formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH_VALUE)) + "megaglest.png")) {
83+
mg_icon_file = formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH_VALUE)) + "megaglest.png";
8484
}
85-
else if(fileExists(CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp")) {
86-
mg_icon_file = CUSTOM_DATA_INSTALL_PATH_VALUE + "megaglest.bmp";
85+
else if(fileExists(formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH_VALUE)) + "megaglest.bmp")) {
86+
mg_icon_file = formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH_VALUE)) + "megaglest.bmp";
8787
}
8888

8989
#endif

‎source/shared_lib/sources/util/properties.cpp

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,20 +215,15 @@ std::map<string,string> Properties::getTagReplacementValues(std::map<string,stri
215215
mapTagReplacementValues["{APPLICATIONPATH}"] = Properties::applicationPath;
216216

217217
#if defined(CUSTOM_DATA_INSTALL_PATH)
218-
mapTagReplacementValues["$APPLICATIONDATAPATH"] = TOSTRING(CUSTOM_DATA_INSTALL_PATH);
219-
mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = TOSTRING(CUSTOM_DATA_INSTALL_PATH);
220-
mapTagReplacementValues["{APPLICATIONDATAPATH}"] = TOSTRING(CUSTOM_DATA_INSTALL_PATH);
221-
222-
//mapTagReplacementValues["$COMMONDATAPATH", string(CUSTOM_DATA_INSTALL_PATH) + "/commondata/");
223-
//mapTagReplacementValues["%%COMMONDATAPATH%%", string(CUSTOM_DATA_INSTALL_PATH) + "/commondata/");
218+
mapTagReplacementValues["$APPLICATIONDATAPATH"] = formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH));
219+
mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH));
220+
mapTagReplacementValues["{APPLICATIONDATAPATH}"] = formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH));
224221

225222
#else
226223
mapTagReplacementValues["$APPLICATIONDATAPATH"] = Properties::applicationPath;
227224
mapTagReplacementValues["%%APPLICATIONDATAPATH%%"] = Properties::applicationPath;
228225
mapTagReplacementValues["{APPLICATIONDATAPATH}"] = Properties::applicationPath;
229226

230-
//mapTagReplacementValues["$COMMONDATAPATH", Properties::applicationPath + "/commondata/");
231-
//mapTagReplacementValues["%%COMMONDATAPATH%%", Properties::applicationPath + "/commondata/");
232227
#endif
233228

234229
mapTagReplacementValues["$GAMEVERSION"] = Properties::gameVersion;
@@ -308,20 +303,15 @@ bool Properties::applyTagsToValue(string &value, std::map<string,string> *mapTag
308303
replaceAll(value, "{APPLICATIONPATH}", Properties::applicationPath);
309304

310305
#if defined(CUSTOM_DATA_INSTALL_PATH)
311-
replaceAll(value, "$APPLICATIONDATAPATH", TOSTRING(CUSTOM_DATA_INSTALL_PATH));
312-
replaceAll(value, "%%APPLICATIONDATAPATH%%", TOSTRING(CUSTOM_DATA_INSTALL_PATH));
313-
replaceAll(value, "{APPLICATIONDATAPATH}", TOSTRING(CUSTOM_DATA_INSTALL_PATH));
314-
315-
//replaceAll(value, "$COMMONDATAPATH", string(CUSTOM_DATA_INSTALL_PATH) + "/commondata/");
316-
//replaceAll(value, "%%COMMONDATAPATH%%", string(CUSTOM_DATA_INSTALL_PATH) + "/commondata/");
306+
replaceAll(value, "$APPLICATIONDATAPATH", formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH)));
307+
replaceAll(value, "%%APPLICATIONDATAPATH%%", formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH)));
308+
replaceAll(value, "{APPLICATIONDATAPATH}", formatPath(TOSTRING(CUSTOM_DATA_INSTALL_PATH)));
317309

318310
#else
319311
replaceAll(value, "$APPLICATIONDATAPATH", Properties::applicationPath);
320312
replaceAll(value, "%%APPLICATIONDATAPATH%%", Properties::applicationPath);
321313
replaceAll(value, "{APPLICATIONDATAPATH}", Properties::applicationPath);
322314

323-
//replaceAll(value, "$COMMONDATAPATH", Properties::applicationPath + "/commondata/");
324-
//replaceAll(value, "%%COMMONDATAPATH%%", Properties::applicationPath + "/commondata/");
325315
#endif
326316

327317
replaceAll(value, "$GAMEVERSION", Properties::gameVersion);

0 commit comments

Comments
 (0)