Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-07-27 12:49:01 +02:00
commit 166acdf69c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeLists.txt
View file

@ -61,7 +61,7 @@ SET(NL_VERSION_MAJOR 0)
SET(NL_VERSION_MINOR 12) SET(NL_VERSION_MINOR 12)
SET(NL_VERSION_PATCH 0) SET(NL_VERSION_PATCH 0)
SET(YEAR "2004-${CURRENT_YEAR}") SET(YEAR "2004-${CURRENT_YEAR}")
SET(AUTHOR "Winchgate and The Ryzom Core Community") SET(AUTHOR "Winch Gate and The Ryzom Core Community")
SET(RYZOM_VERSION_MAJOR 3) SET(RYZOM_VERSION_MAJOR 3)
SET(RYZOM_VERSION_MINOR 0) SET(RYZOM_VERSION_MINOR 0)

6
code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
View file

@ -49,8 +49,8 @@ if(APPLE)
SET(MACOSX_BUNDLE_BUNDLE_NAME "Georges Editor Qt") SET(MACOSX_BUNDLE_BUNDLE_NAME "Georges Editor Qt")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.9") SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.9")
SET(MACOSX_BUNDLE_BUNDLE_VERSION "0.9") SET(MACOSX_BUNDLE_BUNDLE_VERSION "0.9")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") SET(MACOSX_BUNDLE_COPYRIGHT ${AUTHOR})
ENDIF(APPLE) ENDIF()
ADD_EXECUTABLE(georges_editor_qt WIN32 MACOSX_BUNDLE ${GEORGES_EDITOR_SRC} ${GEORGES_EDITOR_MOC_SRCS} ${GEORGES_EDITOR_RC_SRCS} ${GEORGES_EDITOR_UI_HDRS}) ADD_EXECUTABLE(georges_editor_qt WIN32 MACOSX_BUNDLE ${GEORGES_EDITOR_SRC} ${GEORGES_EDITOR_MOC_SRCS} ${GEORGES_EDITOR_RC_SRCS} ${GEORGES_EDITOR_UI_HDRS})
@ -68,6 +68,6 @@ NL_ADD_RUNTIME_FLAGS(georges_editor_qt)
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(georges_editor_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ADD_NATIVE_PRECOMPILED_HEADER(georges_editor_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF(WITH_PCH) ENDIF()
INSTALL(TARGETS georges_editor_qt RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT runtime BUNDLE DESTINATION /Applications) INSTALL(TARGETS georges_editor_qt RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT runtime BUNDLE DESTINATION /Applications)