Changed: #982 Remove seven_zip dependency for Mac OS and Linux client
This commit is contained in:
parent
47c6a176ba
commit
dbbd972c50
1 changed files with 7 additions and 7 deletions
|
@ -1,8 +1,8 @@
|
||||||
ADD_SUBDIRECTORY(seven_zip)
|
|
||||||
|
|
||||||
# These are Windows/MFC apps
|
# These are Windows/MFC apps
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
ADD_SUBDIRECTORY(seven_zip)
|
||||||
ADD_SUBDIRECTORY(bug_report)
|
ADD_SUBDIRECTORY(bug_report)
|
||||||
|
SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(client_sheets)
|
ADD_SUBDIRECTORY(client_sheets)
|
||||||
|
@ -38,7 +38,7 @@ if(APPLE)
|
||||||
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
|
SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
|
||||||
SET(MACOSX_BUNDLE_ICON_FILE "")
|
SET(MACOSX_BUNDLE_ICON_FILE "")
|
||||||
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
|
SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
|
||||||
SET(MACOSX_BUNDLE_LONG_VERSION_STRING "0.8.0")
|
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION})
|
||||||
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
|
SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
|
||||||
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
|
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
|
||||||
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
|
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
|
||||||
|
@ -82,10 +82,10 @@ TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS}
|
||||||
${CURL_LIBRARIES}
|
${CURL_LIBRARIES}
|
||||||
${NELSOUND_LIBRARY}
|
${NELSOUND_LIBRARY}
|
||||||
${NELSNDDRV_LIBRARY}
|
${NELSNDDRV_LIBRARY}
|
||||||
ryzom_clientsheets
|
ryzom_clientsheets
|
||||||
${NELPACS_LIBRARY}
|
${NELPACS_LIBRARY}
|
||||||
${LIBWWW_LIBRARY}
|
${LIBWWW_LIBRARY}
|
||||||
ryzom_sevenzip
|
${SEVENZIP_LIBRARY}
|
||||||
luabind # TODO: find luabind and expat cleanly using a find script
|
luabind # TODO: find luabind and expat cleanly using a find script
|
||||||
expat)
|
expat)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue