Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build date removed from internet menu ( space needed for "IN PROGRESS Message" !); 

CMake now defaults to RelWithDebInfo
This commit is contained in:
Titus Tscharntke 2010-12-17 20:55:46 +00:00
parent b148507411
commit 6ed3a3af53
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -26,6 +26,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
MESSAGE(STATUS "Detected MINGW Compiler...") MESSAGE(STATUS "Detected MINGW Compiler...")
ENDIF() ENDIF()
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
# Default compiler flags # Default compiler flags
#SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") ## Strip binary #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") ## Strip binary
ADD_DEFINITIONS("-fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse") ADD_DEFINITIONS("-fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
@ -39,7 +43,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary
# Release with debug info compiler flags # Release with debug info compiler flags
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g3") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3")
# Release minimum size compiler flags # Release minimum size compiler flags
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O3") SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -O3")

22
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -59,11 +59,11 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, const char
platformLabel.init(i,startOffset-lineOffset); platformLabel.init(i,startOffset-lineOffset);
platformLabel.setText(masterServerInfo.getPlatform()); platformLabel.setText(masterServerInfo.getPlatform());
i+=50; // i+=50;
registeredObjNameList.push_back("binaryCompileDateLabel" + intToStr(lineIndex)); // registeredObjNameList.push_back("binaryCompileDateLabel" + intToStr(lineIndex));
binaryCompileDateLabel.registerGraphicComponent(containerName,"binaryCompileDateLabel" + intToStr(lineIndex)); // binaryCompileDateLabel.registerGraphicComponent(containerName,"binaryCompileDateLabel" + intToStr(lineIndex));
binaryCompileDateLabel.init(i,startOffset-lineOffset); // binaryCompileDateLabel.init(i,startOffset-lineOffset);
binaryCompileDateLabel.setText(masterServerInfo.getBinaryCompileDate()); // binaryCompileDateLabel.setText(masterServerInfo.getBinaryCompileDate());
//game info: //game info:
i+=130; i+=130;
@ -72,7 +72,7 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, const char
serverTitleLabel.init(i,startOffset-lineOffset); serverTitleLabel.init(i,startOffset-lineOffset);
serverTitleLabel.setText(masterServerInfo.getServerTitle()); serverTitleLabel.setText(masterServerInfo.getServerTitle());
i+=160; i+=210;
registeredObjNameList.push_back("ipAddressLabel" + intToStr(lineIndex)); registeredObjNameList.push_back("ipAddressLabel" + intToStr(lineIndex));
ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel" + intToStr(lineIndex)); ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel" + intToStr(lineIndex));
ipAddressLabel.init(i,startOffset-lineOffset); ipAddressLabel.init(i,startOffset-lineOffset);
@ -253,10 +253,10 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
platformLabel.init(i,startOffset-lineOffset); platformLabel.init(i,startOffset-lineOffset);
platformLabel.setText(lang.get("MGPlatform")); platformLabel.setText(lang.get("MGPlatform"));
i+=50; // i+=50;
binaryCompileDateLabel.registerGraphicComponent(containerName,"binaryCompileDateLabel"); // binaryCompileDateLabel.registerGraphicComponent(containerName,"binaryCompileDateLabel");
binaryCompileDateLabel.init(i,startOffset-lineOffset); // binaryCompileDateLabel.init(i,startOffset-lineOffset);
binaryCompileDateLabel.setText(lang.get("MGBuildDateTime")); // binaryCompileDateLabel.setText(lang.get("MGBuildDateTime"));
//game info: //game info:
i+=130; i+=130;
@ -264,7 +264,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
serverTitleLabel.init(i,startOffset-lineOffset); serverTitleLabel.init(i,startOffset-lineOffset);
serverTitleLabel.setText(lang.get("MGGameTitle")); serverTitleLabel.setText(lang.get("MGGameTitle"));
i+=160; i+=210;
ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel"); ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel");
ipAddressLabel.init(i,startOffset-lineOffset); ipAddressLabel.init(i,startOffset-lineOffset);
ipAddressLabel.setText(lang.get("MGGameIP")); ipAddressLabel.setText(lang.get("MGGameIP"));