0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set the compiler mode to c++98.

Browse source 
It was ansi, which will change to c++0x at some point in the future. In
order to activate that as default by accident force the c++98 mode.
This commit is contained in:
Mark de Wever 2010-08-27 20:34:58 +00:00
parent 9d013bfb42
commit 3dc8cb92e8
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -118,11 +118,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi $ENV{CFLAGS} -Wno-unused"
CACHE STRING "Flags used by the C compiler during release builds." FORCE)
set(CMAKE_CXX_FLAGS "-O2 -W -Wall -ansi ${STRICT_FLAGS} $ENV{CXXFLAGS}"
set(CMAKE_CXX_FLAGS "-O2 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
CACHE STRING "Flags used by the CXX compiler during normal builds." FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -ansi ${STRICT_FLAGS} $ENV{CXXFLAGS}"
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS}"
CACHE STRING "Flags used by the CXX compiler during debug builds." FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -ansi ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -W -Wall -std=c++98 ${STRICT_FLAGS} $ENV{CXXFLAGS} -Wno-unused"
CACHE STRING "Flags used by the CXX compiler during release builds." FORCE)
endif(NOT CONFIGURED)

1
changelog
View file

@ -23,6 +23,7 @@ Version 1.9.0+svn:
* Updated height adjust of desert, orcish, and snowy keeps.
* Miscellaneous and bug fixes:
* Removed: statistics upload code.
* Changed: compiler mode set to c++98
Version 1.9.0:
* AI:

4
configure.ac
View file

@ -93,11 +93,11 @@ if test "x$debug" = "xyes"
then
# Don't use ansi for CFLAGS since it fails to compile.
CFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall $CFLAGS"
CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -ansi $CXXFLAGS"
CXXFLAGS="-O0 -DDEBUG -ggdb3 -W -Wall -std=c++98 $CXXFLAGS"
else
# Don't use ansi for CFLAGS since it fails to compile.
CFLAGS="-O2 -W -Wall $CFLAGS"
CXXFLAGS="-O2 -W -Wall -ansi $CXXFLAGS"
CXXFLAGS="-O2 -W -Wall -std=c++98 $CXXFLAGS"
fi
if test "x$profile" = "xyes"