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

Use irrlicht framework from now on

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7145 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-12-23 00:02:07 +00:00
parent 419474731c
commit dbfe55071f
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ide/Xcode/Config.xcconfig
View File

@ -1,8 +1,8 @@
// Xcode build configuration // Xcode build configuration
HEADER_SEARCH_PATHS = /usr/local/include /usr/include /usr/local/include/irrlicht/ "$(PROJECT_DIR)/../../" "$(PROJECT_DIR)/../../bullet/src" "$(PROJECT_DIR)/../../enet/include" /Library/Frameworks/fribidi.framework/Headers HEADER_SEARCH_PATHS = /usr/local/include /usr/include /Library/Frameworks/IrrFramework.framework/Versions/A/Headers/ "$(PROJECT_DIR)/../../" "$(PROJECT_DIR)/../../bullet/src" "$(PROJECT_DIR)/../../enet/include" /Library/Frameworks/fribidi.framework/Headers
OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1 -DHAVE_RTT=1 -DENABLE_BIDI=1 -fvisibility=hidden OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1 -DHAVE_RTT=0 -DENABLE_BIDI=1 -fvisibility=hidden
OTHER_LDFLAGS = -lirrlicht -lintl OTHER_LDFLAGS = -lintl
LIBRARY_SEARCH_PATHS = /usr/local/lib /usr/lib LIBRARY_SEARCH_PATHS = /usr/local/lib /usr/lib

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

@ -50,6 +50,9 @@
952A1554103F68D000B1895D /* profile_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 952A1552103F68D000B1895D /* profile_world.cpp */; }; 952A1554103F68D000B1895D /* profile_world.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 952A1552103F68D000B1895D /* profile_world.cpp */; };
953789730FC7829100DD1F8E /* graph_node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953789720FC7829100DD1F8E /* graph_node.cpp */; }; 953789730FC7829100DD1F8E /* graph_node.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953789720FC7829100DD1F8E /* graph_node.cpp */; };
953789820FC7831400DD1F8E /* quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953789810FC7831400DD1F8E /* quad.cpp */; }; 953789820FC7831400DD1F8E /* quad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953789810FC7831400DD1F8E /* quad.cpp */; };
9538E2B912C25D6800172896 /* addons_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9538E2B512C25D6800172896 /* addons_manager.cpp */; };
9538E2BA12C25D6800172896 /* network_http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9538E2B712C25D6800172896 /* network_http.cpp */; };
9538E2E912C2682B00172896 /* IrrFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9538E2E812C2682B00172896 /* IrrFramework.framework */; };
95395A77129DFE130079BCE7 /* message_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95395A75129DFE130079BCE7 /* message_dialog.cpp */; }; 95395A77129DFE130079BCE7 /* message_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95395A75129DFE130079BCE7 /* message_dialog.cpp */; };
953C304E12BEF384005BB4CD /* tutorial_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953C304C12BEF384005BB4CD /* tutorial_data.cpp */; }; 953C304E12BEF384005BB4CD /* tutorial_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953C304C12BEF384005BB4CD /* tutorial_data.cpp */; };
953F8B2111F7C13C00205E66 /* scalable_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953F8B1F11F7C13C00205E66 /* scalable_font.cpp */; }; 953F8B2111F7C13C00205E66 /* scalable_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 953F8B1F11F7C13C00205E66 /* scalable_font.cpp */; };
@ -61,8 +64,6 @@
954E4C300FF98B6F0047FE3E /* three_d_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 954E4C2B0FF98B6E0047FE3E /* three_d_animation.cpp */; }; 954E4C300FF98B6F0047FE3E /* three_d_animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 954E4C2B0FF98B6E0047FE3E /* three_d_animation.cpp */; };
9551B27111DC0D4D002DD140 /* addons_screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B26D11DC0D4D002DD140 /* addons_screen.cpp */; }; 9551B27111DC0D4D002DD140 /* addons_screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B26D11DC0D4D002DD140 /* addons_screen.cpp */; };
9551B27211DC0D4D002DD140 /* addons_update_screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B26F11DC0D4D002DD140 /* addons_update_screen.cpp */; }; 9551B27211DC0D4D002DD140 /* addons_update_screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B26F11DC0D4D002DD140 /* addons_update_screen.cpp */; };
9551B27A11DC0D6A002DD140 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B27411DC0D6A002DD140 /* addons.cpp */; };
9551B27B11DC0D6A002DD140 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B27611DC0D6A002DD140 /* network.cpp */; };
9551B27C11DC0D6A002DD140 /* zip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B27811DC0D6A002DD140 /* zip.cpp */; }; 9551B27C11DC0D6A002DD140 /* zip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9551B27811DC0D6A002DD140 /* zip.cpp */; };
9551C8270FC1B72500DB481B /* music_information.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95C2AC280F296540000D3E5D /* music_information.cpp */; }; 9551C8270FC1B72500DB481B /* music_information.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95C2AC280F296540000D3E5D /* music_information.cpp */; };
9551C8280FC1B72500DB481B /* music_ogg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95C2AC2A0F296540000D3E5D /* music_ogg.cpp */; }; 9551C8280FC1B72500DB481B /* music_ogg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95C2AC2A0F296540000D3E5D /* music_ogg.cpp */; };
@ -416,6 +417,11 @@
953789720FC7829100DD1F8E /* graph_node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graph_node.cpp; path = ../../tracks/graph_node.cpp; sourceTree = SOURCE_ROOT; }; 953789720FC7829100DD1F8E /* graph_node.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graph_node.cpp; path = ../../tracks/graph_node.cpp; sourceTree = SOURCE_ROOT; };
953789800FC7831400DD1F8E /* quad.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = quad.hpp; path = ../../tracks/quad.hpp; sourceTree = SOURCE_ROOT; }; 953789800FC7831400DD1F8E /* quad.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = quad.hpp; path = ../../tracks/quad.hpp; sourceTree = SOURCE_ROOT; };
953789810FC7831400DD1F8E /* quad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = quad.cpp; path = ../../tracks/quad.cpp; sourceTree = SOURCE_ROOT; }; 953789810FC7831400DD1F8E /* quad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = quad.cpp; path = ../../tracks/quad.cpp; sourceTree = SOURCE_ROOT; };
9538E2B512C25D6800172896 /* addons_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons_manager.cpp; path = ../../addons/addons_manager.cpp; sourceTree = SOURCE_ROOT; };
9538E2B612C25D6800172896 /* addons_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_manager.hpp; path = ../../addons/addons_manager.hpp; sourceTree = SOURCE_ROOT; };
9538E2B712C25D6800172896 /* network_http.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network_http.cpp; path = ../../addons/network_http.cpp; sourceTree = SOURCE_ROOT; };
9538E2B812C25D6800172896 /* network_http.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = network_http.hpp; path = ../../addons/network_http.hpp; sourceTree = SOURCE_ROOT; };
9538E2E812C2682B00172896 /* IrrFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IrrFramework.framework; path = /Library/Frameworks/IrrFramework.framework; sourceTree = "<absolute>"; };
95395A75129DFE130079BCE7 /* message_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = message_dialog.cpp; path = ../../states_screens/dialogs/message_dialog.cpp; sourceTree = SOURCE_ROOT; }; 95395A75129DFE130079BCE7 /* message_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = message_dialog.cpp; path = ../../states_screens/dialogs/message_dialog.cpp; sourceTree = SOURCE_ROOT; };
95395A76129DFE130079BCE7 /* message_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = message_dialog.hpp; path = ../../states_screens/dialogs/message_dialog.hpp; sourceTree = SOURCE_ROOT; }; 95395A76129DFE130079BCE7 /* message_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = message_dialog.hpp; path = ../../states_screens/dialogs/message_dialog.hpp; sourceTree = SOURCE_ROOT; };
953C304C12BEF384005BB4CD /* tutorial_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tutorial_data.cpp; path = ../../tutorial/tutorial_data.cpp; sourceTree = SOURCE_ROOT; }; 953C304C12BEF384005BB4CD /* tutorial_data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tutorial_data.cpp; path = ../../tutorial/tutorial_data.cpp; sourceTree = SOURCE_ROOT; };
@ -445,10 +451,6 @@
9551B26E11DC0D4D002DD140 /* addons_screen.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_screen.hpp; path = ../../states_screens/addons_screen.hpp; sourceTree = SOURCE_ROOT; }; 9551B26E11DC0D4D002DD140 /* addons_screen.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_screen.hpp; path = ../../states_screens/addons_screen.hpp; sourceTree = SOURCE_ROOT; };
9551B26F11DC0D4D002DD140 /* addons_update_screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons_update_screen.cpp; path = ../../states_screens/addons_update_screen.cpp; sourceTree = SOURCE_ROOT; }; 9551B26F11DC0D4D002DD140 /* addons_update_screen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons_update_screen.cpp; path = ../../states_screens/addons_update_screen.cpp; sourceTree = SOURCE_ROOT; };
9551B27011DC0D4D002DD140 /* addons_update_screen.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_update_screen.hpp; path = ../../states_screens/addons_update_screen.hpp; sourceTree = SOURCE_ROOT; }; 9551B27011DC0D4D002DD140 /* addons_update_screen.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons_update_screen.hpp; path = ../../states_screens/addons_update_screen.hpp; sourceTree = SOURCE_ROOT; };
9551B27411DC0D6A002DD140 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../../addons/addons.cpp; sourceTree = SOURCE_ROOT; };
9551B27511DC0D6A002DD140 /* addons.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = addons.hpp; path = ../../addons/addons.hpp; sourceTree = SOURCE_ROOT; };
9551B27611DC0D6A002DD140 /* network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network.cpp; path = ../../addons/network.cpp; sourceTree = SOURCE_ROOT; };
9551B27711DC0D6A002DD140 /* network.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = network.hpp; path = ../../addons/network.hpp; sourceTree = SOURCE_ROOT; };
9551B27811DC0D6A002DD140 /* zip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zip.cpp; path = ../../addons/zip.cpp; sourceTree = SOURCE_ROOT; }; 9551B27811DC0D6A002DD140 /* zip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = zip.cpp; path = ../../addons/zip.cpp; sourceTree = SOURCE_ROOT; };
9551B27911DC0D6A002DD140 /* zip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = zip.hpp; path = ../../addons/zip.hpp; sourceTree = SOURCE_ROOT; }; 9551B27911DC0D6A002DD140 /* zip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = zip.hpp; path = ../../addons/zip.hpp; sourceTree = SOURCE_ROOT; };
9551C7F90FC1B63C00DB481B /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = /Library/Frameworks/Ogg.framework; sourceTree = "<absolute>"; }; 9551C7F90FC1B63C00DB481B /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = /Library/Frameworks/Ogg.framework; sourceTree = "<absolute>"; };
@ -1155,6 +1157,7 @@
9551C9F20FC1B7EE00DB481B /* OpenAL.framework in Frameworks */, 9551C9F20FC1B7EE00DB481B /* OpenAL.framework in Frameworks */,
9551C9F30FC1B7EE00DB481B /* Vorbis.framework in Frameworks */, 9551C9F30FC1B7EE00DB481B /* Vorbis.framework in Frameworks */,
954E486A11B19C4100B1DF63 /* fribidi.framework in Frameworks */, 954E486A11B19C4100B1DF63 /* fribidi.framework in Frameworks */,
9538E2E912C2682B00172896 /* IrrFramework.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -1187,6 +1190,7 @@
9513B40E0F0EDE80005D29F6 /* Frameworks */ = { 9513B40E0F0EDE80005D29F6 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9538E2E812C2682B00172896 /* IrrFramework.framework */,
954E486911B19C4100B1DF63 /* fribidi.framework */, 954E486911B19C4100B1DF63 /* fribidi.framework */,
9551CBD90FC1BB9200DB481B /* AGL.framework */, 9551CBD90FC1BB9200DB481B /* AGL.framework */,
9551C7F90FC1B63C00DB481B /* Ogg.framework */, 9551C7F90FC1B63C00DB481B /* Ogg.framework */,
@ -1280,10 +1284,10 @@
9551B27311DC0D6A002DD140 /* addons */ = { 9551B27311DC0D6A002DD140 /* addons */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9551B27411DC0D6A002DD140 /* addons.cpp */, 9538E2B512C25D6800172896 /* addons_manager.cpp */,
9551B27511DC0D6A002DD140 /* addons.hpp */, 9538E2B612C25D6800172896 /* addons_manager.hpp */,
9551B27611DC0D6A002DD140 /* network.cpp */, 9538E2B712C25D6800172896 /* network_http.cpp */,
9551B27711DC0D6A002DD140 /* network.hpp */, 9538E2B812C25D6800172896 /* network_http.hpp */,
9551B27811DC0D6A002DD140 /* zip.cpp */, 9551B27811DC0D6A002DD140 /* zip.cpp */,
9551B27911DC0D6A002DD140 /* zip.hpp */, 9551B27911DC0D6A002DD140 /* zip.hpp */,
); );
@ -2695,8 +2699,6 @@
9525B71411C851D30094BD96 /* CBatchingMesh.cpp in Sources */, 9525B71411C851D30094BD96 /* CBatchingMesh.cpp in Sources */,
9551B27111DC0D4D002DD140 /* addons_screen.cpp in Sources */, 9551B27111DC0D4D002DD140 /* addons_screen.cpp in Sources */,
9551B27211DC0D4D002DD140 /* addons_update_screen.cpp in Sources */, 9551B27211DC0D4D002DD140 /* addons_update_screen.cpp in Sources */,
9551B27A11DC0D6A002DD140 /* addons.cpp in Sources */,
9551B27B11DC0D6A002DD140 /* network.cpp in Sources */,
9551B27C11DC0D6A002DD140 /* zip.cpp in Sources */, 9551B27C11DC0D6A002DD140 /* zip.cpp in Sources */,
95E6A0C011DCF37800AE088A /* addons_loading.cpp in Sources */, 95E6A0C011DCF37800AE088A /* addons_loading.cpp in Sources */,
9545ABCA11E3E38300D3C37A /* progress_bar_widget.cpp in Sources */, 9545ABCA11E3E38300D3C37A /* progress_bar_widget.cpp in Sources */,
@ -2716,6 +2718,8 @@
9576460812BAD1CF00DB80C7 /* tutorial_manager.cpp in Sources */, 9576460812BAD1CF00DB80C7 /* tutorial_manager.cpp in Sources */,
95AAD98012BAD36300B7B8A3 /* tutorial_screen.cpp in Sources */, 95AAD98012BAD36300B7B8A3 /* tutorial_screen.cpp in Sources */,
953C304E12BEF384005BB4CD /* tutorial_data.cpp in Sources */, 953C304E12BEF384005BB4CD /* tutorial_data.cpp in Sources */,
9538E2B912C25D6800172896 /* addons_manager.cpp in Sources */,
9538E2BA12C25D6800172896 /* network_http.cpp in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };