--- a/QTfrontend/ui/page/pagemain.cpp Fri Jun 07 16:35:48 2013 +0200
+++ b/QTfrontend/ui/page/pagemain.cpp Tue Jun 11 02:46:59 2013 +0200
@@ -136,7 +136,7 @@
#ifdef DEBUG
setDefaultDescription(QLabel::tr("This development build is 'work in progress' and may not be compatible with other versions of the game, while some features might be broken or incomplete!"));
#else
- setDefaultDescription(QLabel::tr("Tip: %1").arg(randomTip()));
+ setDefaultDescription(QLabel::tr("Tip: ") + randomTip());
#endif
}
--- a/QTfrontend/ui_hwform.cpp Fri Jun 07 16:35:48 2013 +0200
+++ b/QTfrontend/ui_hwform.cpp Tue Jun 11 02:46:59 2013 +0200
@@ -56,7 +56,7 @@
HWForm->setMinimumSize(QSize(720, 450));
QString title = QMainWindow::tr("Hedgewars %1").arg(*cVersionString);
#ifdef DEBUG
- title += QString("-r%1 (%2)").arg(*cRevisionString, *cHashString);
+ title += QMainWindow::tr("-r%1 (%2)").arg(*cRevisionString, *cHashString);
#endif
HWForm->setWindowTitle(title);
centralWidget = new QWidget(HWForm);
--- a/misc/libphysfs/CMakeLists.txt Fri Jun 07 16:35:48 2013 +0200
+++ b/misc/libphysfs/CMakeLists.txt Tue Jun 11 02:46:59 2013 +0200
@@ -11,6 +11,11 @@
# Increment this if/when we break backwards compatibility.
set(PHYSFS_SOVERSION 1)
+# 32bit platforms won't link unless this is set
+if(CMAKE_SIZEOF_VOID_P LESS 8)
+ add_definitions(-DPHYSFS_NO_64BIT_SUPPORT=1)
+endif(CMAKE_SIZEOF_VOID_P LESS 8)
+
# I hate that they define "WIN32" ... we're about to move to Win64...I hope!
if(WIN32 AND NOT WINDOWS)
set(WINDOWS TRUE)
@@ -35,15 +40,6 @@
include(CheckCSourceCompiles)
-# 32bit platforms won't link unless this is set
-# although Windows doesn't like it
-if(NOT WINDOWS)
- if(CMAKE_SIZEOF_VOID_P LESS 8)
- add_definitions(-DPHYSFS_NO_64BIT_SUPPORT=1)
- endif(CMAKE_SIZEOF_VOID_P LESS 8)
-endif(NOT WINDOWS)
-
-
if(MACOSX)
# Fallback to older OS X on PowerPC to support wider range of systems...
if(CMAKE_OSX_ARCHITECTURES MATCHES ppc)
--- a/misc/libphysfs/physfs_internal.h Fri Jun 07 16:35:48 2013 +0200
+++ b/misc/libphysfs/physfs_internal.h Tue Jun 11 02:46:59 2013 +0200
@@ -322,13 +322,8 @@
#define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) )
#ifdef PHYSFS_NO_64BIT_SUPPORT
-/* if a 32bit compiler sees something with this many bits: 0xFFFFFFFFFFFFFFFF
- * it doesn't know if it really means 64bit or if it's supposed to squeeze
- * it into 32 bit, so without the ULL it squeezes the number to 32 bit,
- * with it it forces it to be 64bits
- */
-#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x##LL))
-#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x##ULL))
+#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x))
+#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x))
#elif (defined __GNUC__)
#define __PHYSFS_SI64(x) x##LL
#define __PHYSFS_UI64(x) x##ULL