maride/Redline
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update and remove some includes

Browse Source 
You need to obtain "AmbrosiaTools" Framework. I'm not allowed to distribute it. Sorry.
This commit is contained in:
maride 2016-04-02 15:05:42 +02:00
parent 190d4240c6
commit 3fcd1b3023
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
game.xcodeproj/project.pbxproj
View File

@ -7,6 +7,10 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* 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 */; }; 7F06105A0876ED46001EA95C /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FE50876ED46001EA95C /* ai.cpp */; };
7F06105D0876ED46001EA95C /* carphysics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEA0876ED46001EA95C /* carphysics.cpp */; }; 7F06105D0876ED46001EA95C /* carphysics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEA0876ED46001EA95C /* carphysics.cpp */; };
7F06105E0876ED46001EA95C /* carselection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F060FEC0876ED46001EA95C /* carselection.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 */; }; 7FC1DB0E087820970029047D /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DB0D087820970029047D /* QuickTime.framework */; };
7FC1DB330878209F0029047D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DB320878209F0029047D /* OpenGL.framework */; }; 7FC1DB330878209F0029047D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DB320878209F0029047D /* OpenGL.framework */; };
7FC1DC3708782A5C0029047D /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC1DC3608782A5C0029047D /* ForceFeedback.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 */; }; 7FD85AC008BC697A00C3EB17 /* Redline.rsrc in Resources */ = {isa = PBXBuildFile; fileRef = 7FD85ABF08BC697A00C3EB17 /* Redline.rsrc */; };
7FD85B0708BC760A00C3EB17 /* S3Decompression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85B0508BC760A00C3EB17 /* S3Decompression.cpp */; }; 7FD85B0708BC760A00C3EB17 /* S3Decompression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FD85B0508BC760A00C3EB17 /* S3Decompression.cpp */; };
7FD85D4208BC77B900C3EB17 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FD85D4108BC77B900C3EB17 /* IOKit.framework */; }; 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 */; }; 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 */; }; 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 */; }; 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 */; }; 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 */; }; 7FFFAA020886C5F70046AA19 /* Plugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFAA000886C5F70046AA19 /* Plugin.icns */; };
7FFFAA030886C5F70046AA19 /* Redline.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFAA010886C5F70046AA19 /* Redline.icns */; }; 7FFFAA030886C5F70046AA19 /* Redline.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7FFFAA010886C5F70046AA19 /* Redline.icns */; };
8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 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 = "<absolute>"; }; 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; }; 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
7489D5EC1CAFF9D00063AC48 /* AmbrosiaTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AmbrosiaTools.framework; path = Frameworks/AmbrosiaTools.framework; sourceTree = "<group>"; };
7489D5ED1CAFF9D00063AC48 /* ASWAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWAppKit.framework; path = Frameworks/ASWAppKit.framework; sourceTree = "<group>"; };
7489D5EE1CAFF9D10063AC48 /* ASWDebug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWDebug.framework; path = Frameworks/ASWDebug.framework; sourceTree = "<group>"; };
7489D5EF1CAFF9D10063AC48 /* ASWFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ASWFoundation.framework; path = Frameworks/ASWFoundation.framework; sourceTree = "<group>"; };
7F060FE50876ED46001EA95C /* ai.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ai.cpp; sourceTree = "<group>"; }; 7F060FE50876ED46001EA95C /* ai.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ai.cpp; sourceTree = "<group>"; };
7F060FEA0876ED46001EA95C /* carphysics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = carphysics.cpp; sourceTree = "<group>"; }; 7F060FEA0876ED46001EA95C /* carphysics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = carphysics.cpp; sourceTree = "<group>"; };
7F060FEB0876ED46001EA95C /* carphysics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = carphysics.h; sourceTree = "<group>"; }; 7F060FEB0876ED46001EA95C /* carphysics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = carphysics.h; sourceTree = "<group>"; };
@ -278,10 +283,11 @@
7F55FFDB08DDDA9700B82C72 /* ApplicationServices.framework in Frameworks */, 7F55FFDB08DDDA9700B82C72 /* ApplicationServices.framework in Frameworks */,
7F55FFDC08DDDA9800B82C72 /* CoreServices.framework in Frameworks */, 7F55FFDC08DDDA9800B82C72 /* CoreServices.framework in Frameworks */,
7FE3424609AF93CD006C8583 /* Security.framework in Frameworks */, 7FE3424609AF93CD006C8583 /* Security.framework in Frameworks */,
7FDFBE480A1BA49C0022488F /* libSystemStubs.a in Frameworks */,
7F8C14A70A3ABDF900E76109 /* Cocoa.framework in Frameworks */, 7F8C14A70A3ABDF900E76109 /* Cocoa.framework in Frameworks */,
7FC5FD450D49131300C76FF4 /* AmbrosiaTools.framework in Frameworks */, 7489D5F01CAFF9D10063AC48 /* AmbrosiaTools.framework in Frameworks */,
7FED158B0D8FEA1F002AD94E /* librt3_nonag.o in Frameworks */, 7489D5F11CAFF9D10063AC48 /* ASWAppKit.framework in Frameworks */,
7489D5F21CAFF9D10063AC48 /* ASWDebug.framework in Frameworks */,
7489D5F31CAFF9D10063AC48 /* ASWFoundation.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -332,6 +338,10 @@
20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
7489D5EC1CAFF9D00063AC48 /* AmbrosiaTools.framework */,
7489D5ED1CAFF9D00063AC48 /* ASWAppKit.framework */,
7489D5EE1CAFF9D10063AC48 /* ASWDebug.framework */,
7489D5EF1CAFF9D10063AC48 /* ASWFoundation.framework */,
7F8C14A60A3ABDF900E76109 /* Cocoa.framework */, 7F8C14A60A3ABDF900E76109 /* Cocoa.framework */,
7FDFBE470A1BA49C0022488F /* libSystemStubs.a */, 7FDFBE470A1BA49C0022488F /* libSystemStubs.a */,
7FE3424509AF93CD006C8583 /* Security.framework */, 7FE3424509AF93CD006C8583 /* Security.framework */,
@ -676,6 +686,7 @@
"$(inherited)", "$(inherited)",
/apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/AmbrosiaTools,
/apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release,
"$(PROJECT_DIR)/Frameworks",
); );
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
@ -722,6 +733,7 @@
"$(inherited)", "$(inherited)",
/apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/AmbrosiaTools,
/apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release,
"$(PROJECT_DIR)/Frameworks",
); );
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -765,6 +777,7 @@
"$(inherited)", "$(inherited)",
/apps/dev/SDKs/ASW/AmbrosiaTools, /apps/dev/SDKs/ASW/AmbrosiaTools,
/apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release, /apps/dev/SDKs/ASW/ASWRegistration/redline/Framework/Release,
"$(PROJECT_DIR)/Frameworks",
); );
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;

2
game_Prefix.pch
View File

@ -3,4 +3,4 @@
// //
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include "mac-carbon.h" #include <AmbrosiaTools/mac-carbon.h>

4
source/carphysics.cpp
View File

@ -3,9 +3,7 @@
#include <math.h> #include <math.h>
#include "stdtypes.h" #include <AmbrosiaTools/stdtypes.h>
#include "reg_tool_3.h"
#include "rt3_redline.h"
#include "vectors.h" #include "vectors.h"
#include "entities.h" #include "entities.h"

4
source/carselection.cpp
View File

@ -1,6 +1,4 @@
#include "stdtypes.h" #include <AmbrosiaTools/stdtypes.h>
#include "reg_tool_3.h"
#include "rt3_redline.h"
#include <OpenGL/gl.h> #include <OpenGL/gl.h>

2
source/collision.cpp
View File

@ -15,8 +15,6 @@
#include "random.h" #include "random.h"
#include "collision.h" #include "collision.h"
#ifndef __TARGET_TOOLAPP #ifndef __TARGET_TOOLAPP
#include "reg_tool_3.h"
#include "rt3_redline.h"
#endif #endif
#include "gamemem.h" #include "gamemem.h"

5
source/initexit.cpp
View File

@ -27,10 +27,7 @@
#include "transparency.h" #include "transparency.h"
#include "log.h" #include "log.h"
#include "stdtypes.h" #include <AmbrosiaTools/stdtypes.h>
#include "reg_tool_3.h"
#include "rt3_redline.h"
#include "ASWRegistrationCarbonAPI.h"
#include "file_tool.h" #include "file_tool.h"
#include "localtracker.h" #include "localtracker.h"

4
source/interface.cpp
View File

@ -28,9 +28,7 @@
#include "interfacemultiplayer.h" #include "interfacemultiplayer.h"
#include "tracker.h" #include "tracker.h"
#include "stdtypes.h" #include <AmbrosiaTools/stdtypes.h>
#include "reg_tool_3.h"
#include "rt3_redline.h"
tGameInfo gInterfaceGInfo; tGameInfo gInterfaceGInfo;

4
source/tire.cpp
View File

@ -1,8 +1,6 @@
#include <math.h> #include <math.h>
#include "stdtypes.h" #include <AmbrosiaTools/stdtypes.h>
#include "reg_tool_3.h"
#include "rt3_redline.h"
#include "vectors.h" #include "vectors.h"
#include "carphysics.h" #include "carphysics.h"