ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update OSX compilation. Still uses irrlicht from the dependency pack

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-11-06 01:46:41 +00:00
parent c34fb1e7c8
commit 18ad621664
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -85,6 +85,14 @@ else()
endif()
# Irrlicht
if (APPLE)
set(IRRLICHT_LIBRARY "/Library/Frameworks/IrrFramework.framework")
else()
set(IRRLICHT_LIBRARY ${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a)
endif()
# Set some compiler options
if(UNIX)
add_definitions(-Wall)
@ -185,7 +193,7 @@ target_link_libraries(supertuxkart
${CURL_LIBRARIES}
${IRRLICHT_LIBRARIES}
${OGGVORBIS_LIBRARIES}
${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a
${IRRLICHT_LIBRARY}
${IRRLICHT_XF86VM_LIBRARY}
${OPENAL_LIBRARY}
${OPENGL_LIBRARIES})
@ -225,4 +233,4 @@ install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION shar
set(PREFIX ${CMAKE_INSTALL_PREFIX})
configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
add_dependencies(supertuxkart supertuxkart.desktop)
add_dependencies(supertuxkart supertuxkart.desktop)

4
lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
View File

@ -21,6 +21,10 @@
#include <SDL/SDL.h>
#endif
#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
#include "MacOSX/CIrrDeviceMacOSX.h"
#endif
namespace irr
{
namespace video

4
src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
View File

@ -3491,7 +3491,7 @@
GCC_OPTIMIZATION_LEVEL = 1;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_VERSION = "";
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
@ -3518,7 +3518,7 @@
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = SuperTuxKart;
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
STRIP_STYLE = "non-global";
};
name = Release;