mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-27 01:26:30 +00:00
Changed: Minor changes
--HG-- branch : develop
This commit is contained in:
kervala
parent
de0df1645b
commit
12c4adf943
2 changed files with 146 additions and 151 deletions
|
|
@ -304,9 +304,6 @@ void CFontManager::computeStringInfo ( const ucstring &s,
|
|||
// ***************************************************************************
|
||||
string CFontManager::getCacheInformation() const
|
||||
{
|
||||
// stringstream ss;
|
||||
// ss << "MaxMemory: " << (uint) _MaxMemory << " MemSize: " << (uint) _MemSize << " NbChar: " << (uint) _NbChar;
|
||||
// return ss.str();
|
||||
string str;
|
||||
str = "MaxMemory: " + NLMISC::toString(_MaxMemory) + " MemSize: " + NLMISC::toString(_MemSize) + " NbChar: " + NLMISC::toString(_NbChar);
|
||||
return str;
|
||||
|
|
|
|||
|
|
@ -2,28 +2,27 @@
|
|||
ADD_SUBDIRECTORY(client_sheets)
|
||||
|
||||
IF(WITH_RYZOM_CLIENT)
|
||||
# These are Windows/MFC apps
|
||||
SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
|
||||
|
||||
# These are Windows/MFC apps
|
||||
SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
|
||||
ADD_SUBDIRECTORY(seven_zip)
|
||||
|
||||
ADD_SUBDIRECTORY(seven_zip)
|
||||
|
||||
IF(WITH_RYZOM_PATCH)
|
||||
IF(WITH_RYZOM_PATCH)
|
||||
ADD_DEFINITIONS(-DRZ_USE_PATCH)
|
||||
|
||||
IF(WITH_RYZOM_CUSTOM_PATCH_SERVER)
|
||||
ADD_DEFINITIONS(-DRZ_USE_CUSTOM_PATCH_SERVER)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
FILE(GLOB CFG ../*.cfg)
|
||||
FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc)
|
||||
FILE(GLOB SRC_INTERFACE interface_v3/*.h interface_v3/*.cpp)
|
||||
FILE(GLOB SRC_MODE motion/modes/*.cpp motion/modes/*.h)
|
||||
FILE(GLOB SRC_R2 r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp)
|
||||
FILE(GLOB CFG ../*.cfg)
|
||||
FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc)
|
||||
FILE(GLOB SRC_INTERFACE interface_v3/*.h interface_v3/*.cpp)
|
||||
FILE(GLOB SRC_MODE motion/modes/*.cpp motion/modes/*.h)
|
||||
FILE(GLOB SRC_R2 r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp)
|
||||
|
||||
# Filter out the source files not actually compiled.
|
||||
LIST(REMOVE_ITEM SRC
|
||||
# Filter out the source files not actually compiled.
|
||||
LIST(REMOVE_ITEM SRC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/animated_scene_object.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/animated_scene_object.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/animation_fx_sheet.h
|
||||
|
|
@ -34,23 +33,23 @@ LIST(REMOVE_ITEM SRC
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/rosace_functions.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scene_parser.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scene_parser.h)
|
||||
LIST(REMOVE_ITEM SRC_MODE
|
||||
LIST(REMOVE_ITEM SRC_MODE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/motion/modes/free_head.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/motion/modes/free_head.h)
|
||||
LIST(REMOVE_ITEM SRC_INTERFACE
|
||||
LIST(REMOVE_ITEM SRC_INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/lua_dll.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/lua_dll.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h)
|
||||
|
||||
SOURCE_GROUP("" FILES ${SRC})
|
||||
SOURCE_GROUP("cfg" FILES ${CFG})
|
||||
SOURCE_GROUP("interface_v3" FILES ${SRC_INTERFACE})
|
||||
SOURCE_GROUP("mode" FILES ${SRC_MODE})
|
||||
SOURCE_GROUP("r2" FILES ${SRC_R2})
|
||||
SOURCE_GROUP("" FILES ${SRC})
|
||||
SOURCE_GROUP("cfg" FILES ${CFG})
|
||||
SOURCE_GROUP("interface_v3" FILES ${SRC_INTERFACE})
|
||||
SOURCE_GROUP("mode" FILES ${SRC_MODE})
|
||||
SOURCE_GROUP("r2" FILES ${SRC_R2})
|
||||
|
||||
# on Mac, create a .App Bundle
|
||||
if(APPLE)
|
||||
# on Mac, create a .App Bundle
|
||||
if(APPLE)
|
||||
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
|
||||
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
|
||||
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
|
||||
|
|
@ -63,11 +62,11 @@ if(APPLE)
|
|||
SET(RYZOM_CONTENTS_DIR ${RYZOM_OUTPUT_DIR}/Contents)
|
||||
SET(RYZOM_RESOURCES_DIR ${RYZOM_CONTENTS_DIR}/Resources)
|
||||
SET(MAC_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/ryzom/client/macosx)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2})
|
||||
ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2})
|
||||
|
||||
IF(APPLE)
|
||||
IF(APPLE)
|
||||
SET_TARGET_PROPERTIES(ryzom_client PROPERTIES OUTPUT_NAME ${MACOSX_BUNDLE_BUNDLE_NAME})
|
||||
SET_TARGET_PROPERTIES(ryzom_client PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${MAC_RESOURCES_DIR}/Info.plist)
|
||||
ADD_CUSTOM_COMMAND(TARGET ryzom_client PRE_BUILD COMMAND mkdir -p ${RYZOM_RESOURCES_DIR})
|
||||
|
|
@ -101,18 +100,18 @@ IF(APPLE)
|
|||
ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign -fs "${APPLE_CERTIFICATE}" "${RYZOM_OUTPUT_DIR}" COMMENT "Signing bundle...")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${LUA_INCLUDE_DIR}
|
||||
${LUABIND_INCLUDE_DIR}
|
||||
${CURL_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(ryzom_client
|
||||
TARGET_LINK_LIBRARIES(ryzom_client
|
||||
nelmisc
|
||||
nelnet
|
||||
nelligo
|
||||
|
|
@ -128,44 +127,43 @@ TARGET_LINK_LIBRARIES(ryzom_client
|
|||
${LUABIND_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${SEVENZIP_LIBRARY}
|
||||
)
|
||||
)
|
||||
|
||||
IF(NOT APPLE AND NOT WIN32)
|
||||
IF(NOT APPLE AND NOT WIN32)
|
||||
TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(APPLE)
|
||||
IF(APPLE)
|
||||
FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
|
||||
TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
|
||||
|
||||
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
|
||||
NL_ADD_RUNTIME_FLAGS(ryzom_client)
|
||||
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
|
||||
NL_ADD_RUNTIME_FLAGS(ryzom_client)
|
||||
|
||||
IF(FINAL_VERSION)
|
||||
IF(FINAL_VERSION)
|
||||
NL_ADD_LIB_SUFFIX(ryzom_client)
|
||||
ELSE()
|
||||
ELSE()
|
||||
IF(WIN32)
|
||||
SET_TARGET_PROPERTIES(ryzom_client PROPERTIES DEBUG_POSTFIX "_dev_d" RELEASE_POSTFIX "_dev_r")
|
||||
ELSE()
|
||||
SET_TARGET_PROPERTIES(ryzom_client PROPERTIES POSTFIX "_dev")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(WITH_RYZOM_CLIENT_UAC)
|
||||
IF(WITH_RYZOM_CLIENT_UAC)
|
||||
IF(CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||
SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'")
|
||||
ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
|
||||
SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
|
||||
IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
|
||||
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
|
||||
ENDIF()
|
||||
|
||||
INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
|
||||
ENDIF()
|
||||
|
||||
INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
|
||||
ENDIF()
|
||||
|
|
|
|||
Loading…
Reference in a new issue