widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/bug1197429 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1197429 in widelands: "Fail to build in Ubuntu 12.04 LTS"
  https://bugs.launchpad.net/widelands/+bug/1197429

For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1197429/+merge/172835

Seems to be a visibility problem (and an easy fix).

But as with all C++ stuff, I'll let others decide if this really works as intended. ;-)
-- 
https://code.launchpad.net/~qcumber-some/widelands/bug1197429/+merge/172835
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug1197429 into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-17 20:34:53 +0000
+++ CMakeLists.txt	2013-07-03 14:37:30 +0000
@@ -228,7 +228,7 @@
 # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
 set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
 
-set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3")
+set (WL_COMPILERFLAG_OPTIMIZATIONS "-g -O3")
 
 #This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
 IF (CMAKE_COMPILER_IS_GNUCXX)
@@ -241,7 +241,7 @@
   IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
     message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
     message("Suffering from gcc bug, disabling -O3")
-    set (WL_COMPILERFLAG_OPTIMIZATIONS "-O2")
+    set (WL_COMPILERFLAG_OPTIMIZATIONS "-g -O2")
   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
 ENDIF (CMAKE_COMPILER_IS_GNUCXX)
 

=== modified file 'src/logic/ship.h'
--- src/logic/ship.h	2013-06-30 18:18:47 +0000
+++ src/logic/ship.h	2013-07-03 14:37:30 +0000
@@ -23,6 +23,7 @@
 #include "bob.h"
 #include "economy/shippingitem.h"
 #include "graphic/diranimations.h"
+#include <list>
 
 namespace UI {class Window;}
 class Interactive_GameBase;