From 3fcd1b302302959b6579a06e85a1708062e35707 Mon Sep 17 00:00:00 2001 From: maride Date: Sat, 2 Apr 2016 15:05:42 +0200 Subject: [PATCH] Update and remove some includes You need to obtain "AmbrosiaTools" Framework. I'm not allowed to distribute it. Sorry. --- game.xcodeproj/project.pbxproj | 25 +++++++++++++++++++------ game_Prefix.pch | 2 +- source/carphysics.cpp | 4 +--- source/carselection.cpp | 4 +--- source/collision.cpp | 2 -- source/initexit.cpp | 5 +---- source/interface.cpp | 4 +--- source/tire.cpp | 4 +--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/game.xcodeproj/project.pbxproj b/game.xcodeproj/project.pbxproj index 0cc2fa5..8f33d1b 100644 --- a/game.xcodeproj/project.pbxproj +++ b/game.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 7489D5F01CAFF9D10063AC48 /* AmbrosiaTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7489D5EC1CAFF9D00063AC48 /* AmbrosiaTools.framework */; }; + 7489D5F11CAFF9D10063AC48 /* ASWAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7489D5ED1CAFF9D00063AC48 /* ASWAppKit.framework */; }; + 7489D5F21CAFF9D10063AC48 /* ASWDebug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7489D5EE1CAFF9D10063AC48 /* ASWDebug.framework */; }; + 7489D5F31CAFF9D10063AC48 /* ASWFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7489D5EF1CAFF9D10063AC48 /* ASWFoundation.framework */; }; 7F06105A0876ED46001EA95C /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FE50876ED46001EA95C /* ai.cpp */; }; 7F06105D0876ED46001EA95C /* carphysics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEA0876ED46001EA95C /* carphysics.cpp */; }; 7F06105E0876ED46001EA95C /* carselection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEC0876ED46001EA95C /* carselection.cpp */; }; @@ -76,7 +80,6 @@ 7FC1DB0E087820970029047D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DB0D087820970029047D /* QuickTime.framework */; }; 7FC1DB330878209F0029047D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DB320878209F0029047D /* OpenGL.framework */; }; 7FC1DC3708782A5C0029047D /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DC3608782A5C0029047D /* ForceFeedback.framework */; }; - 7FC5FD450D49131300C76FF4 /* AmbrosiaTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC5FD440D49131300C76FF4 /* AmbrosiaTools.framework */; }; 7FD85AC008BC697A00C3EB17 /* Redline.rsrc in Resources */ = {isa = PBXBuildFile; fileRef = 7FD85ABF08BC697A00C3EB17 /* Redline.rsrc */; }; 7FD85B0708BC760A00C3EB17 /* S3Decompression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85B0508BC760A00C3EB17 /* S3Decompression.cpp */; }; 7FD85D4208BC77B900C3EB17 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FD85D4108BC77B900C3EB17 /* IOKit.framework */; }; @@ -87,9 +90,7 @@ 7FD85DF408BC79EF00C3EB17 /* HID_Transaction_Utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85DEE08BC79EF00C3EB17 /* HID_Transaction_Utilities.c */; }; 7FD85DF508BC79EF00C3EB17 /* HID_Utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85DEF08BC79EF00C3EB17 /* HID_Utilities.c */; }; 7FD85E2308BC9B8400C3EB17 /* fpu_exc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85E2208BC9B8400C3EB17 /* fpu_exc.c */; }; - 7FDFBE480A1BA49C0022488F /* libSystemStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FDFBE470A1BA49C0022488F /* libSystemStubs.a */; }; 7FE3424609AF93CD006C8583 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FE3424509AF93CD006C8583 /* Security.framework */; }; - 7FED158B0D8FEA1F002AD94E /* librt3_nonag.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F16E75E0D57AA8200706C33 /* librt3_nonag.o */; }; 7FFFAA020886C5F70046AA19 /* Plugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFAA000886C5F70046AA19 /* Plugin.icns */; }; 7FFFAA030886C5F70046AA19 /* Redline.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFAA010886C5F70046AA19 /* Redline.icns */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; @@ -101,6 +102,10 @@ 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; + 7489D5EC1CAFF9D00063AC48 /* AmbrosiaTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AmbrosiaTools.framework; path = Frameworks/AmbrosiaTools.framework; sourceTree = ""; }; + 7489D5ED1CAFF9D00063AC48 /* ASWAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWAppKit.framework; path = Frameworks/ASWAppKit.framework; sourceTree = ""; }; + 7489D5EE1CAFF9D10063AC48 /* ASWDebug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWDebug.framework; path = Frameworks/ASWDebug.framework; sourceTree = ""; }; + 7489D5EF1CAFF9D10063AC48 /* ASWFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWFoundation.framework; path = Frameworks/ASWFoundation.framework; sourceTree = ""; }; 7F060FE50876ED46001EA95C /* ai.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ai.cpp; sourceTree = ""; }; 7F060FEA0876ED46001EA95C /* carphysics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = carphysics.cpp; sourceTree = ""; }; 7F060FEB0876ED46001EA95C /* carphysics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = carphysics.h; sourceTree = ""; }; @@ -278,10 +283,11 @@ 7F55FFDB08DDDA9700B82C72 /* ApplicationServices.framework in Frameworks */, 7F55FFDC08DDDA9800B82C72 /* CoreServices.framework in Frameworks */, 7FE3424609AF93CD006C8583 /* Security.framework in Frameworks */, - 7FDFBE480A1BA49C0022488F /* libSystemStubs.a in Frameworks */, 7F8C14A70A3ABDF900E76109 /* Cocoa.framework in Frameworks */, - 7FC5FD450D49131300C76FF4 /* AmbrosiaTools.framework in Frameworks */, - 7FED158B0D8FEA1F002AD94E /* librt3_nonag.o in Frameworks */, + 7489D5F01CAFF9D10063AC48 /* AmbrosiaTools.framework in Frameworks */, + 7489D5F11CAFF9D10063AC48 /* ASWAppKit.framework in Frameworks */, + 7489D5F21CAFF9D10063AC48 /* ASWDebug.framework in Frameworks */, + 7489D5F31CAFF9D10063AC48 /* ASWFoundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -332,6 +338,10 @@ 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 7489D5EC1CAFF9D00063AC48 /* AmbrosiaTools.framework */, + 7489D5ED1CAFF9D00063AC48 /* ASWAppKit.framework */, + 7489D5EE1CAFF9D10063AC48 /* ASWDebug.framework */, + 7489D5EF1CAFF9D10063AC48 /* ASWFoundation.framework */, 7F8C14A60A3ABDF900E76109 /* Cocoa.framework */, 7FDFBE470A1BA49C0022488F /* libSystemStubs.a */, 7FE3424509AF93CD006C8583 /* Security.framework */, @@ -676,6 +686,7 @@ "$(inherited)", /apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, + "$(PROJECT_DIR)/Frameworks", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -722,6 +733,7 @@ "$(inherited)", /apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, + "$(PROJECT_DIR)/Frameworks", ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -765,6 +777,7 @@ "$(inherited)", /apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, + "$(PROJECT_DIR)/Frameworks", ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/game_Prefix.pch b/game_Prefix.pch index 4431c58..e5ed3d4 100644 --- a/game_Prefix.pch +++ b/game_Prefix.pch @@ -3,4 +3,4 @@ // #include -#include "mac-carbon.h" \ No newline at end of file +#include \ No newline at end of file diff --git a/source/carphysics.cpp b/source/carphysics.cpp index c8cd3bf..9ec9e22 100755 --- a/source/carphysics.cpp +++ b/source/carphysics.cpp @@ -3,9 +3,7 @@ #include -#include "stdtypes.h" -#include "reg_tool_3.h" -#include "rt3_redline.h" +#include #include "vectors.h" #include "entities.h" diff --git a/source/carselection.cpp b/source/carselection.cpp index 967c674..16fadbb 100644 --- a/source/carselection.cpp +++ b/source/carselection.cpp @@ -1,6 +1,4 @@ -#include "stdtypes.h" -#include "reg_tool_3.h" -#include "rt3_redline.h" +#include #include diff --git a/source/collision.cpp b/source/collision.cpp index cd0cb53..cd8ba96 100755 --- a/source/collision.cpp +++ b/source/collision.cpp @@ -15,8 +15,6 @@ #include "random.h" #include "collision.h" #ifndef __TARGET_TOOLAPP -#include "reg_tool_3.h" -#include "rt3_redline.h" #endif #include "gamemem.h" diff --git a/source/initexit.cpp b/source/initexit.cpp index 3ccbe42..0c7cdb7 100755 --- a/source/initexit.cpp +++ b/source/initexit.cpp @@ -27,10 +27,7 @@ #include "transparency.h" #include "log.h" -#include "stdtypes.h" -#include "reg_tool_3.h" -#include "rt3_redline.h" -#include "ASWRegistrationCarbonAPI.h" +#include #include "file_tool.h" #include "localtracker.h" diff --git a/source/interface.cpp b/source/interface.cpp index 059a181..a5d408a 100644 --- a/source/interface.cpp +++ b/source/interface.cpp @@ -28,9 +28,7 @@ #include "interfacemultiplayer.h" #include "tracker.h" -#include "stdtypes.h" -#include "reg_tool_3.h" -#include "rt3_redline.h" +#include tGameInfo gInterfaceGInfo; diff --git a/source/tire.cpp b/source/tire.cpp index 0a5303c..07c727b 100644 --- a/source/tire.cpp +++ b/source/tire.cpp @@ -1,8 +1,6 @@ #include -#include "stdtypes.h" -#include "reg_tool_3.h" -#include "rt3_redline.h" +#include #include "vectors.h" #include "carphysics.h"