Merge with develop

This commit is contained in:
kervala 2015-12-11 20:21:56 +01:00
commit c2fa7e4137
5 changed files with 35 additions and 19 deletions

View file

@ -174,7 +174,8 @@ public:
/** Build a NeL standard library name according to platform and compilation mode setting. /** Build a NeL standard library name according to platform and compilation mode setting.
* aka : adding decoration one base lib name. * aka : adding decoration one base lib name.
* e.g : 'mylib' become 'mylib_rd.dll' on Windows ReleaseDebug mode or * e.g : 'mylib' become 'mylib_rd.dll' on Windows ReleaseDebug mode,
* 'libmylib.dylib' under OS X or
* 'libmylib.so' on unix system. * 'libmylib.so' on unix system.
*/ */
static std::string makeLibName(const std::string &baseName); static std::string makeLibName(const std::string &baseName);

View file

@ -70,7 +70,7 @@ namespace NLNET
* *
* The library name is the base name that will be 'decorated' * The library name is the base name that will be 'decorated'
* with the nel naming standard according to compilation mode * with the nel naming standard according to compilation mode
* and platform specific file extension (.dll or .so). * and platform specific file extension (.dll, .dylib or .so).
* *
* A module library can only be loaded once. If the library * A module library can only be loaded once. If the library
* is already loaded, the call is ingored. * is already loaded, the call is ingored.

View file

@ -71,6 +71,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName)
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
const string nlLibPrefix; // empty const string nlLibPrefix; // empty
const string nlLibExt(".dll"); const string nlLibExt(".dll");
#elif defined(NL_OS_MAC)
const string nlLibPrefix("lib");
const string nlLibExt(".dylib");
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
const string nlLibPrefix("lib"); const string nlLibPrefix("lib");
const string nlLibExt(".so"); const string nlLibExt(".so");

View file

@ -14,6 +14,14 @@
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>
<string>fr</string>
<string>de</string>
<string>ru</string>
<string>es</string>
</array>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key> <key>CFBundleName</key>
@ -24,27 +32,23 @@
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>LSMinimumSystemVersion</key>
<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
<key>LSFileQuarantineEnabled</key>
<true/>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
<key>LSRequiresCarbon</key>
<true/>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>
<string>fr</string>
<string>de</string>
<string>ru</string>
<string>es</string>
</array>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.role-playing-games</string> <string>public.app-category.role-playing-games</string>
<key>LSFileQuarantineEnabled</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</dict> </dict>
</plist> </plist>

View file

@ -118,7 +118,15 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client") NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
NL_ADD_RUNTIME_FLAGS(ryzom_client) NL_ADD_RUNTIME_FLAGS(ryzom_client)
IF(FINAL_VERSION)
NL_ADD_LIB_SUFFIX(ryzom_client) NL_ADD_LIB_SUFFIX(ryzom_client)
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()
IF(WITH_RYZOM_CLIENT_UAC) IF(WITH_RYZOM_CLIENT_UAC)
IF(CMAKE_GENERATOR MATCHES "Visual Studio") IF(CMAKE_GENERATOR MATCHES "Visual Studio")