Author: cazfi
Date: Thu Jan  5 07:17:32 2017
New Revision: 34783

URL: http://svn.gna.org/viewcvs/freeciv?rev=34783&view=rev
Log:
Define QT_NO_DEBUG in fc_config.h, not compiler command line, when needed.

See patch #8054

Modified:
    branches/S2_6/m4/debug.m4

Modified: branches/S2_6/m4/debug.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/debug.m4?rev=34783&r1=34782&r2=34783&view=diff
==============================================================================
--- branches/S2_6/m4/debug.m4   (original)
+++ branches/S2_6/m4/debug.m4   Thu Jan  5 07:17:32 2017
@@ -27,7 +27,8 @@
   AC_DEFINE([FREECIV_NDEBUG], [1], [No freeciv specific debugging support at 
all])
   FC_C_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CFLAGS])
   if test "x$cxx_works" = "xyes" ; then
-    FC_CXX_FLAGS([-O3 -fomit-frame-pointer -DQT_NO_DEBUG], [], 
[EXTRA_DEBUG_CXXFLAGS])
+    AC_DEFINE([QT_NO_DEBUG], [1], [Qt debugging support disabled])
+    FC_CXX_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CXXFLAGS])
   fi
 fi
 
@@ -38,7 +39,8 @@
   FC_C_FLAGS([-Wall -Wpointer-arith -Wcast-align ],
              [], [EXTRA_DEBUG_CFLAGS])
   if test "x$cxx_works" = "xyes" ; then
-    FC_CXX_FLAGS([-Wall -Wpointer-arith -Wcast-align -DQT_NO_DEBUG],
+    AC_DEFINE([QT_NO_DEBUG], [1], [Qt debugging support disabled])
+    FC_CXX_FLAGS([-Wall -Wpointer-arith -Wcast-align],
                  [], [EXTRA_DEBUG_CXXFLAGS])
   fi
 fi


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to