Compiles again on OSX

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2536 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/MacOSX/AppDelegate.h

@@ -4,7 +4,7 @@
 
 #include "IrrCompileConfig.h"
 
-#ifdef _IRR_USE_OSX_DEVICE_
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
 #import <Cocoa/Cocoa.h>
 #import "CIrrDeviceMacOSX.h"
@@ -20,4 +20,4 @@
 
 @end
 
-#endif // _IRR_USE_OSX_DEVICE_
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_

source/Irrlicht/MacOSX/AppDelegate.mm

@@ -4,7 +4,7 @@
 
 #import "AppDelegate.h"
 
-#ifdef _IRR_USE_OSX_DEVICE_
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
 @implementation AppDelegate
 
@@ -75,4 +75,4 @@
 
 @end
 
-#endif // _IRR_USE_OSX_DEVICE_
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h

@@ -7,7 +7,7 @@
 
 #include "IrrCompileConfig.h"
 
-#ifdef _IRR_USE_OSX_DEVICE_
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
 #include "CIrrDeviceStub.h"
 #include "IrrlichtDevice.h"
@@ -238,6 +238,6 @@ namespace irr
 
 } // end namespace irr
 
-#endif // _IRR_USE_OSX_DEVICE_
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_
 #endif // __C_IRR_DEVICE_MACOSX_H_INCLUDED__
 

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -4,7 +4,7 @@
 
 #include "IrrCompileConfig.h"
 
-#ifdef _IRR_USE_OSX_DEVICE_
+#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
 #import <Cocoa/Cocoa.h>
 #import <OpenGL/gl.h>
@@ -1438,4 +1438,4 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
 
 } // end namespace
 
-#endif // _IRR_USE_OSX_DEVICE_
+#endif // _IRR_COMPILE_WITH_OSX_DEVICE_

source/Irrlicht/MacOSX/MacOSX.xcodeproj/project.pbxproj

@@ -221,6 +221,8 @@
 		09F649600D2CE206001E0599 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E26D0A4850D60014E966 /* Cocoa.framework */; };
 		09F649610D2CE206001E0599 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E26E0A4850D60014E966 /* OpenGL.framework */; };
 		09F649740D2CE2D0001E0599 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 09F649730D2CE2D0001E0599 /* main.cpp */; };
+		3430E4D61022C391006271FD /* CTarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3430E4D41022C391006271FD /* CTarReader.h */; };
+		3430E4D71022C391006271FD /* CTarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3430E4D51022C391006271FD /* CTarReader.cpp */; };
 		3484C4E10F48D1B000C81F60 /* CGUIImageList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3484C4DF0F48D1B000C81F60 /* CGUIImageList.h */; };
 		3484C4E20F48D1B000C81F60 /* CGUIImageList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3484C4E00F48D1B000C81F60 /* CGUIImageList.cpp */; };
 		3484C4EE0F48D3A100C81F60 /* CGUITreeView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3484C4EC0F48D3A100C81F60 /* CGUITreeView.h */; };
@@ -971,6 +973,8 @@
 		09F6493E0D2CE03E001E0599 /* LoadIrrFile_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LoadIrrFile_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		09F649650D2CE206001E0599 /* Quake3Shader_dbg.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Shader_dbg.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		09F649730D2CE2D0001E0599 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = 16.Quake3MapShader/main.cpp; sourceTree = "<group>"; };
+		3430E4D41022C391006271FD /* CTarReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTarReader.h; sourceTree = "<group>"; };
+		3430E4D51022C391006271FD /* CTarReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CTarReader.cpp; sourceTree = "<group>"; };
 		3484C4DF0F48D1B000C81F60 /* CGUIImageList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGUIImageList.h; sourceTree = "<group>"; };
 		3484C4E00F48D1B000C81F60 /* CGUIImageList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CGUIImageList.cpp; sourceTree = "<group>"; };
 		3484C4EC0F48D3A100C81F60 /* CGUITreeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGUITreeView.h; sourceTree = "<group>"; };
@@ -2571,6 +2575,8 @@
 		34FFD9C70F66011C00420884 /* archive */ = {
 			isa = PBXGroup;
 			children = (
+				3430E4D41022C391006271FD /* CTarReader.h */,
+				3430E4D51022C391006271FD /* CTarReader.cpp */,
 				4C53E0030A484C250014E966 /* CZipReader.cpp */,
 				4C53E0040A484C250014E966 /* CZipReader.h */,
 				4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */,
@@ -3119,6 +3125,7 @@
 				34EF91D20F65FCA6000B5651 /* CImageLoaderRGB.h in Headers */,
 				34EF91D70F65FCF6000B5651 /* CPLYMeshFileLoader.h in Headers */,
 				34EF91DC0F65FD14000B5651 /* CPLYMeshWriter.h in Headers */,
+				3430E4D61022C391006271FD /* CTarReader.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4120,6 +4127,7 @@
 				34EF91D30F65FCA6000B5651 /* CImageLoaderRGB.cpp in Sources */,
 				34EF91D80F65FCF6000B5651 /* CPLYMeshFileLoader.cpp in Sources */,
 				34EF91DD0F65FD14000B5651 /* CPLYMeshWriter.cpp in Sources */,
+				3430E4D71022C391006271FD /* CTarReader.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};