Remove the -ansi flag

This commit is contained in:
xboi209 2015-10-09 20:41:08 -07:00
parent 664923370d
commit 5a455db8e2
2 changed files with 0 additions and 16 deletions

View file

@ -12,7 +12,6 @@ project(pvpgn CXX)
option(WITH_BNETD "compile the bnetd target" ON) option(WITH_BNETD "compile the bnetd target" ON)
option(WITH_D2CS "compile the d2cs target" ON) option(WITH_D2CS "compile the d2cs target" ON)
option(WITH_D2DBS "compile the d2dbs target" ON) option(WITH_D2DBS "compile the d2dbs target" ON)
option(WITH_ANSI "enforce strict ISO C++ conforming" ON)
option(WITH_LUA "enable Lua support" OFF) option(WITH_LUA "enable Lua support" OFF)
if(WIN32) if(WIN32)
option(WITH_WIN32_GUI "enable GUI building (default on)" ON) option(WITH_WIN32_GUI "enable GUI building (default on)" ON)

View file

@ -53,9 +53,6 @@ if(WITH_ODBC)
endif(WITH_ODBC) endif(WITH_ODBC)
if(WITH_MYSQL) if(WITH_MYSQL)
find_package(MySQL REQUIRED) find_package(MySQL REQUIRED)
# disable strict ANSI checking when using MySQL headers
# which contain invalid "long long" type
set(WITH_ANSI OFF)
endif(WITH_MYSQL) endif(WITH_MYSQL)
if(WITH_SQLITE3) if(WITH_SQLITE3)
find_package(SQLite3 REQUIRED) find_package(SQLite3 REQUIRED)
@ -240,18 +237,6 @@ check_mkdir_args(MKDIR_TAKES_ONE_ARG)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
#check_cxx_compiler_flag("-Wall" WITH_FLAG_WALL)
if(WITH_ANSI)
# on MINGW non-standard library features are conditioned on __STRICT_ANSI__ not being defined
# (which is stupid since a program using specific system functions can still be standard
# conformant, -ansi doesn't mean to not use non ANSI features it just means to respect
# the standard text)
if(NOT MINGW AND NOT MSVC)
check_cxx_compiler_flag("-pedantic -ansi" WITH_FLAG_ANSIPEDANTIC)
endif(NOT MINGW AND NOT MSVC)
endif(WITH_ANSI)
# new VS.Net deprecates with warnings most of ISO C functions without this # new VS.Net deprecates with warnings most of ISO C functions without this
if(MSVC) if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)