[artoolkit-commits] artoolkit/ARToolKit.xcodeproj project.pbxproj, 1.14, 1.15
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
[artoolkit-commits] artoolkit/ARToolKit.xcodeproj project.pbxproj, 1.14, 1.15
|
From: Philip L. <phi...@us...> - 2006-06-23 06:42:32
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29207 Modified Files: project.pbxproj Log Message: Fix VRML lib inclusion, and detect emulated PPC on Intel. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** project.pbxproj 18 Jun 2006 23:56:20 -0000 1.14 --- project.pbxproj 23 Jun 2006 06:42:27 -0000 1.15 *************** *** 116,119 **** --- 116,135 ---- /* Begin PBXBuildFile section */ + 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; + 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; + 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; + 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; + 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; + 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; + 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; + 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; + 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; + 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; + 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; + 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; + 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; + 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; + 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; + 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; 4A3F11510649F8040042B0D7 /* mAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2B0484329900B56093 /* mAlloc.c */; }; 4A3F11570649F8050042B0D7 /* mAllocDup.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2C0484329900B56093 /* mAllocDup.c */; }; *************** *** 382,387 **** 788C83CD089AB795003E3825 /* simpleVRML.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A1308B1075BE4A700D62ACD /* simpleVRML.c */; }; 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D80086A2DB700DF2FAC /* libARvrml.a */; }; - 788C83DF089AB7FC003E3825 /* libopenvrml-gl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */; }; - 788C83E0089AB802003E3825 /* libopenvrml.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A16075C27F900D62ACD /* libopenvrml.dylib */; }; 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A19075C284C00D62ACD /* libstdc++.a */; }; 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */; }; --- 398,401 ---- *************** *** 1260,1263 **** --- 1274,1297 ---- /* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ + 4A304AD40A4B8C23003AD621 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */, + 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */, + 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */, + 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */, + 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */, + 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */, + 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */, + 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + /* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 4A0D818507526B1B00CB0B40 /* ChangeLog.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog.txt; sourceTree = "<group>"; }; *************** *** 1266,1271 **** 4A1308B0075BE4A700D62ACD /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; 4A1308B1075BE4A700D62ACD /* simpleVRML.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleVRML.c; sourceTree = "<group>"; }; - 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.dylib"; path = "/sw/lib/libopenvrml-gl.dylib"; sourceTree = "<absolute>"; }; - 4A130A16075C27F900D62ACD /* libopenvrml.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.dylib; path = /sw/lib/libopenvrml.dylib; sourceTree = "<absolute>"; }; 4A130A19075C284C00D62ACD /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/gcc/darwin/3.3/libstdc++.a"; sourceTree = "<absolute>"; }; 4A130A48075C2C1B00D62ACD /* simpleVRML.vcproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = simpleVRML.vcproj; sourceTree = "<group>"; }; --- 1300,1303 ---- *************** *** 1273,1276 **** --- 1305,1316 ---- 4A2244950659A20D0014DA8E /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; 4A2246520659B1EA0014DA8E /* simpleLite */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = simpleLite; sourceTree = "<group>"; }; + 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.62.0.0.dylib; path = openvrml/lib/libjpeg.62.0.0.dylib; sourceTree = "<group>"; }; + 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmozjs.dylib; path = openvrml/lib/libmozjs.dylib; sourceTree = "<group>"; }; + 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libnspr4.dylib; path = openvrml/lib/libnspr4.dylib; sourceTree = "<group>"; }; + 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.5.0.1.dylib"; path = "openvrml/lib/libopenvrml-gl.5.0.1.dylib"; sourceTree = "<group>"; }; + 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.4.0.1.dylib; path = openvrml/lib/libopenvrml.4.0.1.dylib; sourceTree = "<group>"; }; + 4A304AE00A4B8D98003AD621 /* libplc4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplc4.dylib; path = openvrml/lib/libplc4.dylib; sourceTree = "<group>"; }; + 4A304AE10A4B8D98003AD621 /* libplds4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplds4.dylib; path = openvrml/lib/libplds4.dylib; sourceTree = "<group>"; }; + 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng.3.1.2.7.dylib; path = openvrml/lib/libpng.3.1.2.7.dylib; sourceTree = "<group>"; }; 4A307DCF07DD3E7B00613859 /* ARVideoSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARVideoSettingsController.m; sourceTree = "<group>"; }; 4A3F14FC064A0C510042B0D7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; *************** *** 1864,1871 **** 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, - 788C83DF089AB7FC003E3825 /* libopenvrml-gl.dylib in Frameworks */, - 788C83E0089AB802003E3825 /* libopenvrml.dylib in Frameworks */, - 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */, 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; --- 1904,1917 ---- 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */, + 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */, + 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */, + 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */, + 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */, + 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */, + 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */, + 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */, + 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */, + 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1987,1990 **** --- 2033,2044 ---- isa = PBXGroup; children = ( + 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */, + 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */, + 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */, + 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */, + 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */, + 4A304AE00A4B8D98003AD621 /* libplc4.dylib */, + 4A304AE10A4B8D98003AD621 /* libplds4.dylib */, + 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */, 4A934B5C086A150A00DF2FAC /* Cocoa.framework */, 4A3F167F064A0E270042B0D7 /* Carbon.framework */, *************** *** 1992,1997 **** 4A3F14FD064A0C510042B0D7 /* OpenGL.framework */, 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */, - 4A130A15075C27F900D62ACD /* libopenvrml-gl.dylib */, - 4A130A16075C27F900D62ACD /* libopenvrml.dylib */, 4A130A19075C284C00D62ACD /* libstdc++.a */, 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */, --- 2046,2049 ---- *************** *** 3169,3172 **** --- 3221,3225 ---- 788C83B7089AB6AE003E3825 /* Sources */, 788C83B9089AB6AE003E3825 /* Frameworks */, + 4A304AD40A4B8C23003AD621 /* CopyFiles */, ); buildRules = ( *************** *** 4922,4929 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! include, ! /sw/include/openvrml, ! /usr/X11R6/include, ); INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 4975,4984 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! /sw/include, ! "$(HEADER_SEARCH_PATHS_QUOTED_1)", ! "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); + HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; + HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 4945,4952 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! include, ! /sw/include/openvrml, ! /usr/X11R6/include, ); INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 5000,5009 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( ! /sw/include, ! "$(HEADER_SEARCH_PATHS_QUOTED_1)", ! "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); + HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; + HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 5646,5654 **** INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( - lib, /sw/lib, /usr/lib/gcc/darwin/3.3, ! "$(SRCROOT)/lib", ); PRODUCT_NAME = simpleVRML; }; --- 5703,5713 ---- INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( /sw/lib, /usr/lib/gcc/darwin/3.3, ! "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ! "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; *************** *** 5667,5671 **** --- 5726,5732 ---- /usr/lib/gcc/darwin/3.3, "$(SRCROOT)/lib", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; |
