Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. 67e50c92b8179e56d5a9a1311c3421d3bc9b5279
|
From: Tom <rtp...@us...> - 2010-05-26 17:56:01
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 67e50c92b8179e56d5a9a1311c3421d3bc9b5279 (commit)
via 7b5c4cc0c150823d6e2c4b6542eddd1eb3a35cf7 (commit)
via 3074c47e2200023fb4cef4f3a2d9d03cc6fdf6f5 (commit)
via c9ff584b7e318fa42aa25ff7ba3121e8632620cb (commit)
via 4a73bc96c5470404bbd08c938861f7698a3f0b7b (commit)
via 17f6b48b66f7b989149d0a54693f9c0ccc4deb42 (commit)
via 48ba7328b199c31e310f2beca10a4b4cd4aaaef6 (commit)
via 3b1a0a64790230f0dd3a1756e9f97ee0b6b0b51c (commit)
Summary of changes:
CMakeLists.txt | 3 ++-
cmake_config.h.in | 3 +++
gemrb/core/CMakeLists.txt | 5 -----
gemrb/core/Holder.h | 5 +++++
gemrb/core/Interface.h | 10 ++++++++++
gemrb/core/MapControl.cpp | 4 ++--
gemrb/core/PluginMgr.h | 1 +
gemrb/core/ResourceManager.h | 4 ++++
gemrb/includes/win32def.h | 1 +
gemrb/plugins/BMPImporter/BMPImporter.cpp | 5 +++--
gemrb/plugins/GUIScript/PythonHelpers.h | 10 ++++++----
11 files changed, 37 insertions(+), 14 deletions(-)
from 95b0de846be83fb919ce434666be79c4d85c2b94 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=67e50c92b8179e56d5a9a1311c3421d3bc9b5279
commit 67e50c92b8179e56d5a9a1311c3421d3bc9b5279
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 13:49:05 2010 -0400
cmake: Put path variables in config.h rather thand command-line.
Apparently msvc6 doesn't like quotes in marcos passed on the command-line.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed2cf9..7c464e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,7 +225,8 @@ IF(APPLE)
FIND_LIBRARY(COCOA_LIBRARY_PATH Cocoa)
ENDIF(APPLE)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h ESCAPE_QUOTES)
#Plugin addition macro
MACRO(ADD_GEMRB_PLUGIN plugin_name)
diff --git a/cmake_config.h.in b/cmake_config.h.in
index adc5198..312ae58 100644
--- a/cmake_config.h.in
+++ b/cmake_config.h.in
@@ -10,3 +10,6 @@
#endif
#cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1
#cmakedefine HAS_VORBIS_SUPPORT 1
+#define PLUGIN_DIR "${PLUGIN_DIR}"
+#define DATA_DIR "${DATA_DIR}"
+#define SYSCONF_DIR "${SYSCONF_DIR}"
diff --git a/gemrb/core/CMakeLists.txt b/gemrb/core/CMakeLists.txt
index 1c666d9..6e9ca32 100644
--- a/gemrb/core/CMakeLists.txt
+++ b/gemrb/core/CMakeLists.txt
@@ -4,11 +4,6 @@ FILE(GLOB gemrb_core_LIB_SRCS "*.cpp")
ADD_LIBRARY(gemrb_core SHARED ${gemrb_core_LIB_SRCS} )
-SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- COMPILE_DEFINITIONS
- "PLUGINDIR=\"${PLUGIN_DIR}\";DATADIR=\"${DATA_DIR}\";SYSCONFDIR=\"${SYSCONF_DIR}\""
- )
-
IF(WIN32)
INSTALL(TARGETS gemrb_core RUNTIME DESTINATION ${LIB_DIR})
ELSE(WIN32)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=7b5c4cc0c150823d6e2c4b6542eddd1eb3a35cf7
commit 7b5c4cc0c150823d6e2c4b6542eddd1eb3a35cf7
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 13:48:57 2010 -0400
msvc6: More fixes.
diff --git a/gemrb/plugins/GUIScript/PythonHelpers.h b/gemrb/plugins/GUIScript/PythonHelpers.h
index b98ea0a..9b76d09 100644
--- a/gemrb/plugins/GUIScript/PythonHelpers.h
+++ b/gemrb/plugins/GUIScript/PythonHelpers.h
@@ -62,7 +62,7 @@ public:
obj = id;
else
PyErr_Clear();
- if (!PyCObject_Check(obj) || PyCObject_GetDesc(obj) != &T::ID) {
+ if (!PyCObject_Check(obj) || PyCObject_GetDesc(obj) != const_cast<TypeID*>(&T::ID)) {
printMessage("GUIScript","Bad CObject extracted.\n",LIGHT_RED);
return;
}
@@ -84,7 +84,7 @@ public:
private:
static void PyRelease(void *obj, void *desc)
{
- if (desc != &T::ID) {
+ if (desc != const_cast<TypeID*>(&T::ID)) {
printMessage("GUIScript","Bad CObject deleted.\n",LIGHT_RED);
return;
}
@@ -97,8 +97,10 @@ PyObject* MakePyList(const Container &source)
{
size_t size = source.size();
PyObject *list = PyList_New(size);
- for (size_t i = 0; i < size; ++i)
- PyList_SET_ITEM(list, i, CObject<T>(source[i]));
+ for (size_t i = 0; i < size; ++i) {
+ // SET_ITEM might be preferable to SetItem here, but MSVC6 doesn't like it.
+ PyList_SetItem(list, i, CObject<T>(source[i]));
+ }
return list;
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3074c47e2200023fb4cef4f3a2d9d03cc6fdf6f5
commit 3074c47e2200023fb4cef4f3a2d9d03cc6fdf6f5
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 12:01:59 2010 -0400
msvc6: More fixes.
diff --git a/gemrb/plugins/BMPImporter/BMPImporter.cpp b/gemrb/plugins/BMPImporter/BMPImporter.cpp
index bdba276..9c18998 100644
--- a/gemrb/plugins/BMPImporter/BMPImporter.cpp
+++ b/gemrb/plugins/BMPImporter/BMPImporter.cpp
@@ -264,7 +264,8 @@ Bitmap* BMPImporter::GetBitmap()
unsigned char *p = ( unsigned char * ) pixels;
switch (BitCount) {
case 8:
- for (unsigned int y = 0; y < Height; y++) {
+ unsigned int y;
+ for (y = 0; y < Height; y++) {
for (unsigned int x = 0; x < Width; x++) {
data->SetAt(x,y,p[y*Width + x]);
}
@@ -274,7 +275,7 @@ Bitmap* BMPImporter::GetBitmap()
printMessage("BMPImporter", "Don't know how to handle 24bit bitmap from ", WHITE);
printf( "%s...", str->filename );
printStatus( "ERROR", LIGHT_RED );
- for (unsigned int y = 0; y < Height; y++) {
+ for (y = 0; y < Height; y++) {
for (unsigned int x = 0; x < Width; x++) {
data->SetAt(x,y,p[3*(y*Width + x)]);
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c9ff584b7e318fa42aa25ff7ba3121e8632620cb
commit c9ff584b7e318fa42aa25ff7ba3121e8632620cb
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 11:58:37 2010 -0400
msvc6: Disable warning.
diff --git a/gemrb/includes/win32def.h b/gemrb/includes/win32def.h
index b72019c..8f04a7f 100644
--- a/gemrb/includes/win32def.h
+++ b/gemrb/includes/win32def.h
@@ -37,6 +37,7 @@
# if _MSC_VER >= 1000
// 4251 disables the annoying warning about missing dll interface in templates
# pragma warning( disable: 4251 521 )
+# pragma warning( disable: 4275 )
//disables annoying warning caused by STL:Map in msvc 6.0
# if _MSC_VER < 7000
# pragma warning(disable:4786)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=4a73bc96c5470404bbd08c938861f7698a3f0b7b
commit 4a73bc96c5470404bbd08c938861f7698a3f0b7b
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 11:58:19 2010 -0400
msvc6: More fixes.
diff --git a/gemrb/core/Holder.h b/gemrb/core/Holder.h
index 912560c..789635f 100644
--- a/gemrb/core/Holder.h
+++ b/gemrb/core/Holder.h
@@ -77,7 +77,12 @@ public:
T* operator->() const { return ptr; }
bool operator!() const { return !ptr; }
// Copied from boost/smart_ptr/detail/operator_bool.hpp
+#ifndef _MSC_VER
operator T* Holder<T>::*() const { return ptr == NULL ? NULL : &Holder<T>::ptr; }
+#else // MSVC6
+ // FIXME: Figure out what version doesn't need this hack.
+ operator bool() const { return ptr != NULL; }
+#endif
T* get() const { return ptr; }
void release() {
if (ptr)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=17f6b48b66f7b989149d0a54693f9c0ccc4deb42
commit 17f6b48b66f7b989149d0a54693f9c0ccc4deb42
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 11:51:14 2010 -0400
msvc6: SFINAE fixes.
diff --git a/gemrb/core/Interface.h b/gemrb/core/Interface.h
index 746f31b..c4d7fde 100644
--- a/gemrb/core/Interface.h
+++ b/gemrb/core/Interface.h
@@ -37,6 +37,16 @@
#include "GlobalTimer.h"
#include "Holder.h"
+#ifdef _MSC_VER // No SFINAE
+#include "Audio.h"
+#include "DataFileMgr.h"
+#include "MusicMgr.h"
+#include "ScriptEngine.h"
+#include "StringMgr.h"
+#include "SymbolMgr.h"
+#include "Video.h"
+#endif
+
class Audio;
class Video;
class Resource;
diff --git a/gemrb/core/ResourceManager.h b/gemrb/core/ResourceManager.h
index 21319f9..2608d15 100644
--- a/gemrb/core/ResourceManager.h
+++ b/gemrb/core/ResourceManager.h
@@ -26,6 +26,10 @@
#include "SClassID.h"
#include "Holder.h"
+#ifdef _MSC_VER // No SFINAE
+#include "ResourceSource.h"
+#endif
+
class DataStream;
class Resource;
class ResourceSource;
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=48ba7328b199c31e310f2beca10a4b4cd4aaaef6
commit 48ba7328b199c31e310f2beca10a4b4cd4aaaef6
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 11:35:19 2010 -0400
More MSVC6 fixes.
diff --git a/gemrb/core/MapControl.cpp b/gemrb/core/MapControl.cpp
index d68c728..b8d5724 100644
--- a/gemrb/core/MapControl.cpp
+++ b/gemrb/core/MapControl.cpp
@@ -192,7 +192,8 @@ void MapControl::Draw(unsigned short XWin, unsigned short YWin)
// we're going to paint over labels/etc, so they need to repaint!
bool seen_this = false;
- for (unsigned int i = 0; i < Owner->GetControlCount(); i++) {
+ unsigned int i;
+ for (i = 0; i < Owner->GetControlCount(); i++) {
Control *ctrl = Owner->GetControl(i);
if (!ctrl) continue;
@@ -223,7 +224,6 @@ void MapControl::Draw(unsigned short XWin, unsigned short YWin)
video->DrawRect( vp, colors[green], false, false );
- int i;
// Draw PCs' ellipses
Game *game = core->GetGame();
i = game->GetPartySize(true);
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3b1a0a64790230f0dd3a1756e9f97ee0b6b0b51c
commit 3b1a0a64790230f0dd3a1756e9f97ee0b6b0b51c
Author: Tom Prince <tom...@ua...>
Date: Wed May 26 10:55:33 2010 -0400
Fix for MSVC6.
diff --git a/gemrb/core/PluginMgr.h b/gemrb/core/PluginMgr.h
index daf5038..ec56895 100644
--- a/gemrb/core/PluginMgr.h
+++ b/gemrb/core/PluginMgr.h
@@ -65,6 +65,7 @@ public:
void LoadPlugins(char* pluginpath);
private:
PluginMgr();
+public: // HACK: MSVC6 is buggy.
~PluginMgr(void);
private:
struct PluginDesc {
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|