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

Rename Optimize build variant to Optimized for clarity

Browse source
This commit is contained in:
loonycyborg 2016-11-26 14:58:14 +03:00
parent 15a11796c7
commit 60329a87a1
4 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
CMakeLists.txt
View file

@ -100,21 +100,22 @@ endif(NOT CMAKE_BUILD_TYPE)
# Add additional build with optional LTO flags
MESSAGE("Adding Optimize build")
if("${ENABLE_LTO}" STREQUAL "yes")
MESSAGE("LTO is enabled for Optimize build")
set(CMAKE_CXX_FLAGS_OPTIMIZE "-O3 -march=native -flto -s" CACHE STRING "Flags for a more highly optimized build" FORCE)
set(CMAKE_C_FLAGS_OPTIMIZE "-O3 -march=native -flto -s" CACHE STRING "Flags for a more highly optimized build with LTO" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZE "-fuse-ld=gold" CACHE STRING "Flags for a more highly optimized build with LTO" FORCE)
MESSAGE("LTO is enabled for Optimized build")
set(CMAKE_CXX_FLAGS_OPTIMIZED "-O3 -march=native -flto -s" CACHE STRING "Flags for a more highly optimized build" FORCE)
set(CMAKE_C_FLAGS_OPTIMIZED "-O3 -march=native -flto -s" CACHE STRING "Flags for a more highly optimized build with LTO" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZED "-fuse-ld=gold" CACHE STRING "Flags for a more highly optimized build with LTO" FORCE)
else()
MESSAGE("LTO is not enabled for Optimize build")
set(CMAKE_CXX_FLAGS_OPTIMIZE "-O3 -march=native -s" CACHE STRING "Flags for a more highly optimized build without LTO" FORCE)
set(CMAKE_C_FLAGS_OPTIMIZE "-O3 -march=native -s" CACHE STRING "Flags for a more highly optimized build without LTO" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZE "" CACHE STRING "" FORCE)
MESSAGE("LTO is not enabled for Optimized build")
set(CMAKE_CXX_FLAGS_OPTIMIZED "-O3 -march=native -s" CACHE STRING "Flags for a more highly optimized build without LTO" FORCE)
set(CMAKE_C_FLAGS_OPTIMIZED "-O3 -march=native -s" CACHE STRING "Flags for a more highly optimized build without LTO" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_OPTIMIZED "" CACHE STRING "" FORCE)
endif()
set(CMAKE_SHARED_LINKER_FLAGS_OPTIMIZE "" CACHE STRING "Not used" FORCE)
MARK_AS_ADVANCED(CMAKE_CXX_FLAGS_OPTIMIZE CMAKE_C_FLAGS_OPTIMIZE CMAKE_EXE_LINKER_FLAGS_OPTIMIZE CMAKE_SHARED_LINKER_FLAGS_OPTIMIZE)
set(CMAKE_SHARED_LINKER_FLAGS_OPTIMIZED "" CACHE STRING "Not used" FORCE)
MARK_AS_ADVANCED(CMAKE_CXX_FLAGS_OPTIMIZED CMAKE_C_FLAGS_OPTIMIZED
CMAKE_EXE_LINKER_FLAGS_OPTIMIZED CMAKE_SHARED_LINKER_FLAGS_OPTIMIZED)
# set CMAKE_AR and CMAKE_RANLIB to use LTO-enabled variants if the build is Optimize and LTO is enabled
if("${CMAKE_BUILD_TYPE}" STREQUAL "Optimize" AND "${ENABLE_LTO}" STREQUAL "yes")
if("${CMAKE_BUILD_TYPE}" STREQUAL "Optimized" AND "${ENABLE_LTO}" STREQUAL "yes")
MESSAGE("Using gcc-ar and gcc-ranlib")
find_program(LTO_AR NAMES gcc-ar)
find_program(LTO_RANLIB NAMES gcc-ranlib)
@ -554,20 +555,22 @@ if(WIN32)
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "added -march=pentiumpro" FORCE)
MESSAGE("added -march=pentiumpro to Release build")
separate_arguments(CMAKE_CXX_FLAGS_OPTIMIZE)
list(REMOVE_ITEM CMAKE_CXX_FLAGS_OPTIMIZE "-march=native")
list(APPEND CMAKE_CXX_FLAGS_OPTIMIZE "-march=pentiumpro")
list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_OPTIMIZE)
string(REPLACE ";" " " CMAKE_CXX_FLAGS_OPTIMIZE "${CMAKE_CXX_FLAGS_OPTIMIZE}")
set(CMAKE_CXX_FLAGS_OPTIMIZE "${CMAKE_CXX_FLAGS_OPTIMIZE}" CACHE STRING "added -march=pentiumpro" FORCE)
separate_arguments(CMAKE_CXX_FLAGS_OPTIMIZED)
list(REMOVE_ITEM CMAKE_CXX_FLAGS_OPTIMIZED "-march=native")
list(APPEND CMAKE_CXX_FLAGS_OPTIMIZED "-march=pentiumpro")
list(REMOVE_DUPLICATES CMAKE_CXX_FLAGS_OPTIMIZED)
string(REPLACE ";" " " CMAKE_CXX_FLAGS_OPTIMIZED
"${CMAKE_CXX_FLAGS_OPTIMIZED}")
set(CMAKE_CXX_FLAGS_OPTIMIZED "${CMAKE_CXX_FLAGS_OPTIMIZED}" CACHE STRING "added -march=pentiumpro" FORCE)
MESSAGE("added -march=pentiumpro to Optimize build")
separate_arguments(CMAKE_C_FLAGS_OPTIMIZE)
list(REMOVE_ITEM CMAKE_C_FLAGS_OPTIMIZE "-march=native")
list(APPEND CMAKE_C_FLAGS_OPTIMIZE "-march=pentiumpro")
list(REMOVE_DUPLICATES CMAKE_C_FLAGS_OPTIMIZE)
string(REPLACE ";" " " CMAKE_C_FLAGS_OPTIMIZE "${CMAKE_C_FLAGS_OPTIMIZE}")
set(CMAKE_C_FLAGS_OPTIMIZE "${CMAKE_C_FLAGS_OPTIMIZE}" CACHE STRING "added -march=pentiumpro" FORCE)
separate_arguments(CMAKE_C_FLAGS_OPTIMIZED)
list(REMOVE_ITEM CMAKE_C_FLAGS_OPTIMIZED "-march=native")
list(APPEND CMAKE_C_FLAGS_OPTIMIZED "-march=pentiumpro")
list(REMOVE_DUPLICATES CMAKE_C_FLAGS_OPTIMIZED)
string(REPLACE ";" " " CMAKE_C_FLAGS_OPTIMIZED
"${CMAKE_C_FLAGS_OPTIMIZED}")
set(CMAKE_C_FLAGS_OPTIMIZED "${CMAKE_C_FLAGS_OPTIMIZED}" CACHE STRING "added -march=pentiumpro" FORCE)
MESSAGE("added -march=pentiumpro to Optimize build")
endif(WIN32)

6
SConstruct
View file

@ -47,14 +47,14 @@ def OptionalPath(key, val, env):
opts.AddVariables(
ListVariable('default_targets', 'Targets that will be built if no target is specified in command line.',
"wesnoth,wesnothd", Split("wesnoth wesnothd campaignd cutter exploder test")),
EnumVariable('build', 'Build variant: debug, release profile or base (no subdirectory)', "release", ["optimize", "release", "debug", "glibcxx_debug", "profile", "base"]),
EnumVariable('build', 'Build variant: debug, release profile or base (no subdirectory)', "release", ["optimized", "release", "debug", "glibcxx_debug", "profile", "base"]),
PathVariable('build_dir', 'Build all intermediate files(objects, test programs, etc) under this dir', "build", PathVariable.PathAccept),
('extra_flags_config', "Extra compiler and linker flags to use for configuration and all builds. Whether they're compiler or linker is determined by env.ParseFlags. Unknown flags are compile flags by default. This applies to all extra_flags_* variables", ""),
('extra_flags_base', 'Extra compiler and linker flags to use for release builds', ""),
('extra_flags_release', 'Extra compiler and linker flags to use for release builds', ""),
('extra_flags_debug', 'Extra compiler and linker flags to use for debug builds', ""),
('extra_flags_profile', 'Extra compiler and linker flags to use for profile builds', ""),
('extra_flags_optimize', 'Extra compiler and linker flags to use for optimized builds', ""),
('extra_flags_optimized', 'Extra compiler and linker flags to use for optimized builds', ""),
BoolVariable('enable_lto', 'Whether to enable Link Time Optimization', False),
PathVariable('bindir', 'Where to install binaries', "bin", PathVariable.PathAccept),
('cachedir', 'Directory that contains a cache of derived files.', ''),
@ -533,7 +533,7 @@ builds = {
"glibcxx_debug" : dict(CPPDEFINES = Split("_GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC")),
"release" : dict(CCFLAGS = Split("$OPT_FLAGS")),
"profile" : dict(CCFLAGS = "-pg", LINKFLAGS = "-pg"),
"optimize" : dict(CCFLAGS = Split("$HIGH_OPT_COMP_FLAGS"), LINKFLAGS=Split("$HIGH_OPT_LINK_FLAGS"))
"optimized" : dict(CCFLAGS = Split("$HIGH_OPT_COMP_FLAGS"), LINKFLAGS=Split("$HIGH_OPT_LINK_FLAGS"))
}
builds["glibcxx_debug"].update(builds["debug"])
build = env["build"]

2
src/SConscript
View file

@ -610,7 +610,7 @@ def error_action(target, source, env):
raise UserError, "Target disabled because its prerequisites are not met"
def WesnothProgram(env, target, source, can_build, **kw):
if env["build"] == "optimize" and env["enable_lto"] == True:
if env["build"] == "optimized" and env["enable_lto"] == True:
env["AR"] = 'gcc-ar'
env["RANLIB"] = 'gcc-ranlib'

2
src/lua/SConscript
View file

@ -42,7 +42,7 @@ env_lua = env.Clone(
CPPPATH = ["$CPPPATH", Dir(".").srcnode()],
CPPDEFINES = ["$CPPDEFINES", env["PLATFORM"] != "win32" and "LUA_USE_POSIX" or []])
if env_lua["build"] == "optimize" and env_lua["enable_lto"] == True:
if env_lua["build"] == "optimized" and env_lua["enable_lto"] == True:
env_lua["AR"] = 'gcc-ar'
env_lua["RANLIB"] = 'gcc-ranlib'