Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
  • 7 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
16 CMakeLists.txt
View
@@ -108,12 +108,14 @@ elseif (${LAYOUT} MATCHES "opt")
SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
SET_PATH( EXAMPLE_CONF_DIR ${SYSCONF_DIR} )
else (${LAYOUT} MATCHES "bundle") # Mac or iOS
+ SET(CMAKE_INSTALL_RPATH @loader_path/../Frameworks)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
# most paths are irrelevant since the items will be bundled with application
SET_PATH( BIN_DIR /Applications )
# TODO: these should be copied during build and not install.
- SET_PATH( LIB_DIR "${BIN_DIR}/${PROJECT_NAME}.app/Contents/Frameworks" )
SET_PATH( PLUGIN_DIR "${BIN_DIR}/${PROJECT_NAME}.app/Contents/Plugins" )
SET_PATH( DOC_DIR "${BIN_DIR}/${PROJECT_NAME}.app/Contents/Resources" )
+ SET_PATH( LIB_DIR @loader_path/../Frameworks )
endif (${LAYOUT} MATCHES "home")
# check if this is a release version
@@ -355,9 +357,15 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name)
endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR})
endif (STATIC_LINK)
- SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX ""
- INSTALL_RPATH ${LIB_DIR}
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/plugins)
+
+ IF (APPLE)
+ SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX ""
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/${PROJECT_NAME}.app/Contents/PlugIns)
+ ELSE (APPLE)
+ SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX ""
+ INSTALL_RPATH ${LIB_DIR}
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/plugins)
+ ENDIF (APPLE)
ENDMACRO(ADD_GEMRB_PLUGIN)
# also put the chosen paths in the man page (Ubuntu)
5 apple/osx/Info.plist
View
@@ -24,11 +24,6 @@
<string>automatic</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.role-playing-games</string>
- <key>LSMinimumSystemVersionByArchitecture</key>
- <dict>
- <key>x86_64</key>
- <string>10.6.0</string>
- </dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
6 cmake/cmake_config.h.in
View
@@ -5,9 +5,9 @@
#cmakedefine HAVE_STRNDUP 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1
-#define PLUGINDIR "${PLUGIN_DIR}"
-#define DATADIR "${DATA_DIR}"
-#define SYSCONFDIR "${SYSCONF_DIR}"
+#cmakedefine PLUGINDIR "${PLUGIN_DIR}"
+#cmakedefine DATADIR "${DATA_DIR}"
+#cmakedefine SYSCONFDIR "${SYSCONF_DIR}"
#cmakedefine NOCOLOR ${NOCOLOR}
#cmakedefine HAVE_MALLOC_H 1
#cmakedefine HAVE_UNISTD_H 1
2  gemrb/CMakeLists.txt
View
@@ -70,7 +70,7 @@ IF(WIN32)
ELSE(WIN32)
IF(APPLE)
# custom info.plist
- SET_TARGET_PROPERTIES(gemrb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ../../apple/osx/Info.plist)
+ SET_TARGET_PROPERTIES(gemrb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ../../apple/osx/Info.plist OUTPUT_NAME GemRB)
# compile nib
ADD_CUSTOM_COMMAND (TARGET gemrb POST_BUILD
9 gemrb/core/CMakeLists.txt
View
@@ -151,12 +151,9 @@ else (STATIC_LINK)
ENDIF(WIN32)
endif (STATIC_LINK)
-SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- COMPILE_DEFINITIONS
- "PLUGINDIR=\"${PLUGIN_DIR}\";DATADIR=\"${DATA_DIR}\";SYSCONFDIR=\"${SYSCONF_DIR}\""
- )
-
IF (APPLE)
SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
- INSTALL_NAME_DIR ${LIB_DIR})
+ INSTALL_NAME_DIR ${LIB_DIR}
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/gemrb/${PROJECT_NAME}.app/Contents/Frameworks
+)
ENDIF (APPLE)
4 gemrb/core/InterfaceConfig.cpp
View
@@ -18,6 +18,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "globals.h"
#include "InterfaceConfig.h"
1  gemrb/plugins/TTFImporter/TTFFontManager.cpp
View
@@ -39,6 +39,7 @@ void destroyFT()
{
if (library) {
FT_Done_FreeType( library );
+ library = NULL;
}
}

No commit comments for this range

Something went wrong with that request. Please try again.