mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
5f3ecbe8ff
commit
a1356178fd
3 changed files with 24 additions and 23 deletions
|
@ -64,6 +64,7 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
|
|||
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}")
|
||||
ENDIF(WIN32)
|
||||
ENDMACRO(NL_ADD_RUNTIME_FLAGS)
|
||||
|
||||
###
|
||||
# Checks build vs. source location. Prevents In-Source builds.
|
||||
###
|
||||
|
@ -228,7 +229,7 @@ MACRO(NL_SETUP_BUILD_FLAGS)
|
|||
## MinSizeRel
|
||||
SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||
SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_CFLAGS} ${PLATFORM_CFLAGS} ")
|
||||
SET(LINK_FLAGS_MINSIZEREL "${CMAKE_LINK_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_LINK_CFLAGS} ${PLATFORM_LINKFLAGS} ")
|
||||
SET(CMAKE_LINK_FLAGS_MINSIZEREL "${CMAKE_LINK_FLAGS_MINSIZEREL} ${NL_RELEASEDEBUG_LINK_CFLAGS} ${PLATFORM_LINKFLAGS} ")
|
||||
ENDMACRO(NL_SETUP_BUILD_FLAGS)
|
||||
|
||||
MACRO(NL_SETUP_PREFIX_PATHS)
|
||||
|
|
|
@ -10,8 +10,8 @@ ADD_SUBDIRECTORY(client_sheets)
|
|||
FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h motion/modes/*.cpp motion/modes/*.h r2/*.h r2/*.cpp r2/dmc/*.h r2/dmc/*.cpp interface_v3/*.h interface_v3/*.cpp)
|
||||
|
||||
# Filter out the source files not actually compiled.
|
||||
LIST(REMOVE_ITEM SRC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/animated_scene_object.cpp
|
||||
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
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/animation_fx_sheet.cpp
|
||||
|
@ -53,7 +53,7 @@ if(APPLE)
|
|||
# COMMAND ${CMAKE_COMMAND} -E make_directory
|
||||
# ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks
|
||||
# # copy framework into app bundle
|
||||
# COMMAND ${CMAKE_COMMAND} -E copy ${SOME_LIBRARY}
|
||||
# COMMAND ${CMAKE_COMMAND} -E copy ${SOME_LIBRARY}
|
||||
# ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks
|
||||
# # ...
|
||||
# # install_name_tool the lib pathes
|
||||
|
@ -63,24 +63,24 @@ ELSE(APPLE)
|
|||
ENDIF(APPLE)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${NEL_INCLUDE_DIR}
|
||||
${LUA_INCLUDE_DIR}
|
||||
${LIBWWW_INCLUDE_DIR}
|
||||
${CURL_INCLUDE_DIRS}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${NEL_INCLUDE_DIR}
|
||||
${LUA_INCLUDE_DIR}
|
||||
${LIBWWW_INCLUDE_DIR}
|
||||
${CURL_INCLUDE_DIRS}
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
${NELMISC_LIBRARY}
|
||||
ryzom_gameshare
|
||||
${NELNET_LIBRARY}
|
||||
${NELLIGO_LIBRARY}
|
||||
${NELGEORGES_LIBRARY}
|
||||
${NEL3D_LIBRARY}
|
||||
${LUA_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${NELSOUND_LIBRARY}
|
||||
TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
${NELMISC_LIBRARY}
|
||||
ryzom_gameshare
|
||||
${NELNET_LIBRARY}
|
||||
${NELLIGO_LIBRARY}
|
||||
${NELGEORGES_LIBRARY}
|
||||
${NEL3D_LIBRARY}
|
||||
${LUA_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${NELSOUND_LIBRARY}
|
||||
${NELSNDDRV_LIBRARY}
|
||||
ryzom_clientsheets
|
||||
${NELPACS_LIBRARY}
|
||||
|
@ -88,7 +88,7 @@ TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS}
|
|||
ryzom_sevenzip
|
||||
luabind # TODO: find luabind and expat cleanly using a find script
|
||||
expat)
|
||||
|
||||
|
||||
IF(NOT WITH_COCOA)
|
||||
TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
|
||||
ENDIF(NOT WITH_COCOA)
|
||||
|
|
|
@ -168,7 +168,7 @@ uint TipsOfTheDayIndex;
|
|||
|
||||
|
||||
// XML allocator functions
|
||||
// Due to Bug #906, we disable the stl xml allocation
|
||||
// Due to Bug #906, we disable the stl xml allocation
|
||||
/*
|
||||
static volatile bool XmlAllocUsesSTL = true;
|
||||
|
||||
|
@ -691,7 +691,7 @@ void prelogInit()
|
|||
// _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF );
|
||||
|
||||
// Init XML Lib allocator
|
||||
// Due to Bug #906, we disable the stl xml allocation
|
||||
// Due to Bug #906, we disable the stl xml allocation
|
||||
// nlverify (xmlMemSetup (XmlFree4NeL, XmlMalloc4NeL, XmlRealloc4NeL, XmlStrdup4NeL) == 0);
|
||||
|
||||
// Init the debug memory
|
||||
|
|
Loading…
Reference in a new issue