diff --git a/AppKit/AppKit.xcodeproj/project.pbxproj b/AppKit/AppKit.xcodeproj/project.pbxproj index 41f2816d..2d77de21 100644 --- a/AppKit/AppKit.xcodeproj/project.pbxproj +++ b/AppKit/AppKit.xcodeproj/project.pbxproj @@ -1037,7 +1037,6 @@ C8A2E4000F07EA1F0054397C /* KTFont_FT.h in Headers */ = {isa = PBXBuildFile; fileRef = C8746BAB0EA3EE11007A6BE2 /* KTFont_FT.h */; settings = {ATTRIBUTES = (Private, ); }; }; C8A2E4030F07EA1F0054397C /* O2Font.h in Headers */ = {isa = PBXBuildFile; fileRef = FE25FF600EE58712009C91B1 /* O2Font.h */; settings = {ATTRIBUTES = (Private, ); }; }; C8A2E4040F07EA1F0054397C /* NSDictionaryController.h in Headers */ = {isa = PBXBuildFile; fileRef = C85D91930EE6A806004EBAEA /* NSDictionaryController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C8A2E4050F07EA1F0054397C /* NSOpenGLDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */; settings = {ATTRIBUTES = (Private, ); }; }; C8A2E4070F07EA1F0054397C /* NSActionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B53250976075200DA0954 /* NSActionCell.m */; settings = {ATTRIBUTES = (); }; }; C8A2E4080F07EA1F0054397C /* NSAlertPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B53290976075200DA0954 /* NSAlertPanel.m */; settings = {ATTRIBUTES = (); }; }; C8A2E4090F07EA1F0054397C /* NSApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B532B0976075200DA0954 /* NSApplication.m */; settings = {ATTRIBUTES = (); }; }; @@ -1337,7 +1336,6 @@ C8A2E53E0F07EA1F0054397C /* O2Font.m in Sources */ = {isa = PBXBuildFile; fileRef = FE25FF610EE58712009C91B1 /* O2Font.m */; }; C8A2E53F0F07EA1F0054397C /* NSDictionaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = C85D91940EE6A806004EBAEA /* NSDictionaryController.m */; }; C8A2E5400F07EA1F0054397C /* CTFont.m in Sources */ = {isa = PBXBuildFile; fileRef = FE337FC90EE77A6C00D4A751 /* CTFont.m */; }; - C8A2E5410F07EA1F0054397C /* NSOpenGLDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */; }; C8A2E5430F07EA1F0054397C /* NSFontPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E2B54DF0976075300DA0954 /* NSFontPanel.nib */; }; C8A2E5440F07EA1F0054397C /* NSColorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E2B54E10976075300DA0954 /* NSColorPanel.nib */; }; C8A2E5450F07EA1F0054397C /* NSToolbarCustomizationPalette.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6E2B54E30976075300DA0954 /* NSToolbarCustomizationPalette.nib */; }; @@ -1389,10 +1387,6 @@ C8AB730F0F40C21A00D93B96 /* NSControllerMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = C8AB73090F40C21A00D93B96 /* NSControllerMarker.m */; }; C8C52C8F0E7ED1FF003F03B5 /* NSObservationProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = C8C52C8D0E7ED1FF003F03B5 /* NSObservationProxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; C8C52C900E7ED1FF003F03B5 /* NSObservationProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C8C52C8E0E7ED1FF003F03B5 /* NSObservationProxy.m */; }; - C8E0BDF00F0E4F5200677729 /* NSOpenGLDrawable_X11.h in Headers */ = {isa = PBXBuildFile; fileRef = C8E0BDEE0F0E4F5200677729 /* NSOpenGLDrawable_X11.h */; settings = {ATTRIBUTES = (Private, ); }; }; - C8E0BDF10F0E4F5200677729 /* NSOpenGLDrawable_X11.m in Sources */ = {isa = PBXBuildFile; fileRef = C8E0BDEF0F0E4F5200677729 /* NSOpenGLDrawable_X11.m */; }; - C8E0BDF20F0E4F5200677729 /* NSOpenGLDrawable_X11.h in Headers */ = {isa = PBXBuildFile; fileRef = C8E0BDEE0F0E4F5200677729 /* NSOpenGLDrawable_X11.h */; settings = {ATTRIBUTES = (Private, ); }; }; - C8E0BDF30F0E4F5200677729 /* NSOpenGLDrawable_X11.m in Sources */ = {isa = PBXBuildFile; fileRef = C8E0BDEF0F0E4F5200677729 /* NSOpenGLDrawable_X11.m */; }; C8E0BE9A0F0E54B500677729 /* NSOpenGLContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B20976075400DA0954 /* NSOpenGLContext.m */; }; C8E0BE9B0F0E54B500677729 /* NSOpenGLPixelFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B40976075400DA0954 /* NSOpenGLPixelFormat.m */; }; C8E0BE9C0F0E54B500677729 /* NSOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B60976075400DA0954 /* NSOpenGLView.m */; }; @@ -2243,10 +2237,6 @@ FE49B9AC1030C49300ADCC6C /* NSCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = FE49B9A61030C49300ADCC6C /* NSCollectionViewItem.m */; }; FE49B9AD1030C49300ADCC6C /* NSCollectionViewItem.h in Headers */ = {isa = PBXBuildFile; fileRef = FE49B9A51030C49300ADCC6C /* NSCollectionViewItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; FE49B9AE1030C49300ADCC6C /* NSCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = FE49B9A61030C49300ADCC6C /* NSCollectionViewItem.m */; }; - FE54BEC90EEB086900B4559F /* NSOpenGLDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE54BECA0EEB086900B4559F /* NSOpenGLDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */; }; - FE54BECB0EEB086900B4559F /* NSOpenGLDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE54BECC0EEB086900B4559F /* NSOpenGLDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */; }; FE572D8F0CA0809500FB3E79 /* O2ImageSource_BMP.h in Headers */ = {isa = PBXBuildFile; fileRef = FE572D8B0CA0809500FB3E79 /* O2ImageSource_BMP.h */; }; FE572D900CA0809500FB3E79 /* O2ImageSource_BMP.m in Sources */ = {isa = PBXBuildFile; fileRef = FE572D8C0CA0809500FB3E79 /* O2ImageSource_BMP.m */; }; FE5A88DC10C6F50E005E348A /* AppKitExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2B53FA0976075200DA0954 /* AppKitExport.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; @@ -2581,10 +2571,8 @@ FE5A8A2D10C6F50E005E348A /* O2Context_cairo.h in Headers */ = {isa = PBXBuildFile; fileRef = C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE5A8A2F10C6F50E005E348A /* O2Font.h in Headers */ = {isa = PBXBuildFile; fileRef = FE25FF600EE58712009C91B1 /* O2Font.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE5A8A3010C6F50E005E348A /* NSDictionaryController.h in Headers */ = {isa = PBXBuildFile; fileRef = C85D91930EE6A806004EBAEA /* NSDictionaryController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FE5A8A3110C6F50E005E348A /* NSOpenGLDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE5A8A3210C6F50E005E348A /* gif_lib.h in Headers */ = {isa = PBXBuildFile; fileRef = FE669C8C0F12B1A600534F46 /* gif_lib.h */; }; FE5A8A3310C6F50E005E348A /* O2ImageSource_GIF.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC0C77F0F146AF800903F6D /* O2ImageSource_GIF.h */; }; - FE5A8A3710C6F50E005E348A /* NSOpenGLDrawable_X11.h in Headers */ = {isa = PBXBuildFile; fileRef = C8E0BDEE0F0E4F5200677729 /* NSOpenGLDrawable_X11.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE5A8A3810C6F50E005E348A /* NSToolbarItemView.h in Headers */ = {isa = PBXBuildFile; fileRef = FE38749A0F4333D600EC9F00 /* NSToolbarItemView.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE5A8A3910C6F50E005E348A /* NSToolbarItemGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6BE4440F446B92007D7F3F /* NSToolbarItemGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; FE5A8A3A10C6F50E005E348A /* NSControllerMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = C8AB73080F40C21A00D93B96 /* NSControllerMarker.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2915,10 +2903,8 @@ FE5A8B8710C6F50E005E348A /* O2Font.m in Sources */ = {isa = PBXBuildFile; fileRef = FE25FF610EE58712009C91B1 /* O2Font.m */; }; FE5A8B8810C6F50E005E348A /* NSDictionaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = C85D91940EE6A806004EBAEA /* NSDictionaryController.m */; }; FE5A8B8910C6F50E005E348A /* CTFont.m in Sources */ = {isa = PBXBuildFile; fileRef = FE337FC90EE77A6C00D4A751 /* CTFont.m */; }; - FE5A8B8A10C6F50E005E348A /* NSOpenGLDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */; }; FE5A8B8B10C6F50E005E348A /* gif_lib.m in Sources */ = {isa = PBXBuildFile; fileRef = FE669C840F12B1A600534F46 /* gif_lib.m */; }; FE5A8B8C10C6F50E005E348A /* O2ImageSource_GIF.m in Sources */ = {isa = PBXBuildFile; fileRef = FEC0C7800F146AF800903F6D /* O2ImageSource_GIF.m */; }; - FE5A8B9010C6F50E005E348A /* NSOpenGLDrawable_X11.m in Sources */ = {isa = PBXBuildFile; fileRef = C8E0BDEF0F0E4F5200677729 /* NSOpenGLDrawable_X11.m */; }; FE5A8B9110C6F50E005E348A /* NSOpenGLContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B20976075400DA0954 /* NSOpenGLContext.m */; }; FE5A8B9210C6F50E005E348A /* NSOpenGLPixelFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B40976075400DA0954 /* NSOpenGLPixelFormat.m */; }; FE5A8B9310C6F50E005E348A /* NSOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B60976075400DA0954 /* NSOpenGLView.m */; }; @@ -3355,7 +3341,6 @@ FEA314C90FD5667D00F480D4 /* NSGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 36570F980E818CD5008FE1BE /* NSGradient.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEA314CA0FD5667D00F480D4 /* NSUserDefaultsControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = C84909350E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; FEA314CF0FD5667D00F480D4 /* NSDictionaryController.h in Headers */ = {isa = PBXBuildFile; fileRef = C85D91930EE6A806004EBAEA /* NSDictionaryController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FEA314D00FD5667D00F480D4 /* NSOpenGLDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */; settings = {ATTRIBUTES = (Private, ); }; }; FEA314D70FD5667D00F480D4 /* NSToolbarItemView.h in Headers */ = {isa = PBXBuildFile; fileRef = FE38749A0F4333D600EC9F00 /* NSToolbarItemView.h */; settings = {ATTRIBUTES = (Private, ); }; }; FEA314D80FD5667D00F480D4 /* NSToolbarItemGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6BE4440F446B92007D7F3F /* NSToolbarItemGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEA314D90FD5667D00F480D4 /* NSControllerMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = C8AB73080F40C21A00D93B96 /* NSControllerMarker.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -3572,7 +3557,6 @@ FEA316050FD5667D00F480D4 /* NSGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 36570F990E818CD5008FE1BE /* NSGradient.m */; }; FEA316060FD5667D00F480D4 /* NSUserDefaultsControllerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C84909360E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m */; }; FEA3160B0FD5667D00F480D4 /* NSDictionaryController.m in Sources */ = {isa = PBXBuildFile; fileRef = C85D91940EE6A806004EBAEA /* NSDictionaryController.m */; }; - FEA3160D0FD5667D00F480D4 /* NSOpenGLDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */; }; FEA316150FD5667D00F480D4 /* NSOpenGLContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B20976075400DA0954 /* NSOpenGLContext.m */; }; FEA316160FD5667D00F480D4 /* NSOpenGLPixelFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B40976075400DA0954 /* NSOpenGLPixelFormat.m */; }; FEA316170FD5667D00F480D4 /* NSOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B56B60976075400DA0954 /* NSOpenGLView.m */; }; @@ -4438,8 +4422,6 @@ C8B239A20BF8EEB500CA33AF /* defaultBindingOptions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = defaultBindingOptions.plist; sourceTree = ""; }; C8C52C8D0E7ED1FF003F03B5 /* NSObservationProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSObservationProxy.h; sourceTree = ""; }; C8C52C8E0E7ED1FF003F03B5 /* NSObservationProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSObservationProxy.m; sourceTree = ""; }; - C8E0BDEE0F0E4F5200677729 /* NSOpenGLDrawable_X11.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSOpenGLDrawable_X11.h; sourceTree = ""; }; - C8E0BDEF0F0E4F5200677729 /* NSOpenGLDrawable_X11.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSOpenGLDrawable_X11.m; sourceTree = ""; }; C8E4F57F0BFF7A8A0076D5E6 /* NSAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAffineTransform.h; sourceTree = ""; }; C8E4F5800BFF7A8A0076D5E6 /* NSAffineTransform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAffineTransform.m; sourceTree = ""; }; FE01AAC10C5D9BCB00AEA51A /* AppKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AppKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -4594,8 +4576,6 @@ FE49B9A61030C49300ADCC6C /* NSCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSCollectionViewItem.m; path = NSCollectionView/NSCollectionViewItem.m; sourceTree = ""; }; FE4BDC090BCD40C600E19685 /* NSFontDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NSFontDescriptor.h; sourceTree = ""; }; FE4BDC0A0BCD40C600E19685 /* NSFontDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSFontDescriptor.m; sourceTree = ""; }; - FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSOpenGLDrawable.h; sourceTree = ""; }; - FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSOpenGLDrawable.m; sourceTree = ""; }; FE56BA020B1221330046B7D9 /* NSMutableAttributedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NSMutableAttributedString.h; sourceTree = ""; }; FE56BA030B1221330046B7D9 /* NSMutableAttributedString.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSMutableAttributedString.m; sourceTree = ""; }; FE572D8B0CA0809500FB3E79 /* O2ImageSource_BMP.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = O2ImageSource_BMP.h; sourceTree = ""; }; @@ -5534,8 +5514,6 @@ isa = PBXGroup; children = ( FE4478071039F64E00ECD6A6 /* NSOpenGL.h */, - FE54BEC70EEB086900B4559F /* NSOpenGLDrawable.h */, - FE54BEC80EEB086900B4559F /* NSOpenGLDrawable.m */, 6E2B56B90976075400DA0954 /* NSOpenGLContext.h */, 6E2B56B20976075400DA0954 /* NSOpenGLContext.m */, FE6DC16A0BA85BEC0082AC66 /* NSOpenGLPixelBuffer.h */, @@ -5666,8 +5644,6 @@ FE9131D610E93C0500FFF5D7 /* X11Event.h */, FE9131D710E93C0500FFF5D7 /* X11Event.m */, FEE7E0B610E26487004A50F8 /* CGLContext.m */, - C8E0BDEE0F0E4F5200677729 /* NSOpenGLDrawable_X11.h */, - C8E0BDEF0F0E4F5200677729 /* NSOpenGLDrawable_X11.m */, FEA2CD4410D6D870003C8FF5 /* O2Context_builtin_FT.h */, FEA2CD4510D6D870003C8FF5 /* O2Context_builtin_FT.m */, C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */, @@ -6399,10 +6375,8 @@ C81BEA0F0EA6038800478D50 /* O2Context_cairo.h in Headers */, FE25FF640EE58712009C91B1 /* O2Font.h in Headers */, C85D91950EE6A806004EBAEA /* NSDictionaryController.h in Headers */, - FE54BECB0EEB086900B4559F /* NSOpenGLDrawable.h in Headers */, FE669CA80F12B1A600534F46 /* gif_lib.h in Headers */, FEC0C7830F146AF800903F6D /* O2ImageSource_GIF.h in Headers */, - C8E0BDF00F0E4F5200677729 /* NSOpenGLDrawable_X11.h in Headers */, FE38749E0F4333D600EC9F00 /* NSToolbarItemView.h in Headers */, FE6BE4480F446B92007D7F3F /* NSToolbarItemGroup.h in Headers */, C8AB730A0F40C21A00D93B96 /* NSControllerMarker.h in Headers */, @@ -6780,9 +6754,7 @@ C8A2E4000F07EA1F0054397C /* KTFont_FT.h in Headers */, C8A2E4030F07EA1F0054397C /* O2Font.h in Headers */, C8A2E4040F07EA1F0054397C /* NSDictionaryController.h in Headers */, - C8A2E4050F07EA1F0054397C /* NSOpenGLDrawable.h in Headers */, C8A2E6080F07F4540054397C /* O2Context_cairo.h in Headers */, - C8E0BDF20F0E4F5200677729 /* NSOpenGLDrawable_X11.h in Headers */, FE3874A00F4333D600EC9F00 /* NSToolbarItemView.h in Headers */, FE6BE44A0F446B92007D7F3F /* NSToolbarItemGroup.h in Headers */, C8AB730C0F40C21A00D93B96 /* NSControllerMarker.h in Headers */, @@ -7158,7 +7130,6 @@ C84909370E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h in Headers */, FE25FF620EE58712009C91B1 /* O2Font.h in Headers */, C85D91970EE6A806004EBAEA /* NSDictionaryController.h in Headers */, - FE54BEC90EEB086900B4559F /* NSOpenGLDrawable.h in Headers */, FEA25F980EECCE4D008750D0 /* NSSound_win32.h in Headers */, FE669C9A0F12B1A600534F46 /* gif_lib.h in Headers */, FEC0C7810F146AF800903F6D /* O2ImageSource_GIF.h in Headers */, @@ -7536,10 +7507,8 @@ FE5A8A2D10C6F50E005E348A /* O2Context_cairo.h in Headers */, FE5A8A2F10C6F50E005E348A /* O2Font.h in Headers */, FE5A8A3010C6F50E005E348A /* NSDictionaryController.h in Headers */, - FE5A8A3110C6F50E005E348A /* NSOpenGLDrawable.h in Headers */, FE5A8A3210C6F50E005E348A /* gif_lib.h in Headers */, FE5A8A3310C6F50E005E348A /* O2ImageSource_GIF.h in Headers */, - FE5A8A3710C6F50E005E348A /* NSOpenGLDrawable_X11.h in Headers */, FE5A8A3810C6F50E005E348A /* NSToolbarItemView.h in Headers */, FE5A8A3910C6F50E005E348A /* NSToolbarItemGroup.h in Headers */, FE5A8A3A10C6F50E005E348A /* NSControllerMarker.h in Headers */, @@ -7848,7 +7817,6 @@ FEA314C90FD5667D00F480D4 /* NSGradient.h in Headers */, FEA314CA0FD5667D00F480D4 /* NSUserDefaultsControllerProxy.h in Headers */, FEA314CF0FD5667D00F480D4 /* NSDictionaryController.h in Headers */, - FEA314D00FD5667D00F480D4 /* NSOpenGLDrawable.h in Headers */, FEA314D70FD5667D00F480D4 /* NSToolbarItemView.h in Headers */, FEA314D80FD5667D00F480D4 /* NSToolbarItemGroup.h in Headers */, FEA314D90FD5667D00F480D4 /* NSControllerMarker.h in Headers */, @@ -8775,10 +8743,8 @@ FE25FF650EE58712009C91B1 /* O2Font.m in Sources */, C85D91960EE6A806004EBAEA /* NSDictionaryController.m in Sources */, FE337FCB0EE77A6C00D4A751 /* CTFont.m in Sources */, - FE54BECC0EEB086900B4559F /* NSOpenGLDrawable.m in Sources */, FE669CA00F12B1A600534F46 /* gif_lib.m in Sources */, FEC0C7840F146AF800903F6D /* O2ImageSource_GIF.m in Sources */, - C8E0BDF10F0E4F5200677729 /* NSOpenGLDrawable_X11.m in Sources */, C8E0BE9D0F0E54B500677729 /* NSOpenGLContext.m in Sources */, C8E0BE9E0F0E54B500677729 /* NSOpenGLPixelFormat.m in Sources */, C8E0BE9F0F0E54B500677729 /* NSOpenGLView.m in Sources */, @@ -9136,9 +9102,7 @@ C8A2E53E0F07EA1F0054397C /* O2Font.m in Sources */, C8A2E53F0F07EA1F0054397C /* NSDictionaryController.m in Sources */, C8A2E5400F07EA1F0054397C /* CTFont.m in Sources */, - C8A2E5410F07EA1F0054397C /* NSOpenGLDrawable.m in Sources */, C8A2379A0F09AC6300A3EC80 /* O2Context_cairo.m in Sources */, - C8E0BDF30F0E4F5200677729 /* NSOpenGLDrawable_X11.m in Sources */, C8E0BE9A0F0E54B500677729 /* NSOpenGLContext.m in Sources */, C8E0BE9B0F0E54B500677729 /* NSOpenGLPixelFormat.m in Sources */, C8E0BE9C0F0E54B500677729 /* NSOpenGLView.m in Sources */, @@ -9534,7 +9498,6 @@ FE25FF630EE58712009C91B1 /* O2Font.m in Sources */, C85D91980EE6A806004EBAEA /* NSDictionaryController.m in Sources */, FE337FCA0EE77A6C00D4A751 /* CTFont.m in Sources */, - FE54BECA0EEB086900B4559F /* NSOpenGLDrawable.m in Sources */, FEA25F990EECCE4D008750D0 /* NSSound_win32.m in Sources */, FE669C920F12B1A600534F46 /* gif_lib.m in Sources */, FEC0C7820F146AF800903F6D /* O2ImageSource_GIF.m in Sources */, @@ -9886,10 +9849,8 @@ FE5A8B8710C6F50E005E348A /* O2Font.m in Sources */, FE5A8B8810C6F50E005E348A /* NSDictionaryController.m in Sources */, FE5A8B8910C6F50E005E348A /* CTFont.m in Sources */, - FE5A8B8A10C6F50E005E348A /* NSOpenGLDrawable.m in Sources */, FE5A8B8B10C6F50E005E348A /* gif_lib.m in Sources */, FE5A8B8C10C6F50E005E348A /* O2ImageSource_GIF.m in Sources */, - FE5A8B9010C6F50E005E348A /* NSOpenGLDrawable_X11.m in Sources */, FE5A8B9110C6F50E005E348A /* NSOpenGLContext.m in Sources */, FE5A8B9210C6F50E005E348A /* NSOpenGLPixelFormat.m in Sources */, FE5A8B9310C6F50E005E348A /* NSOpenGLView.m in Sources */, @@ -10162,7 +10123,6 @@ FEA316050FD5667D00F480D4 /* NSGradient.m in Sources */, FEA316060FD5667D00F480D4 /* NSUserDefaultsControllerProxy.m in Sources */, FEA3160B0FD5667D00F480D4 /* NSDictionaryController.m in Sources */, - FEA3160D0FD5667D00F480D4 /* NSOpenGLDrawable.m in Sources */, FEA316150FD5667D00F480D4 /* NSOpenGLContext.m in Sources */, FEA316160FD5667D00F480D4 /* NSOpenGLPixelFormat.m in Sources */, FEA316170FD5667D00F480D4 /* NSOpenGLView.m in Sources */, diff --git a/AppKit/NSWindow.m b/AppKit/NSWindow.m index a143ae7b..40abaac3 100755 --- a/AppKit/NSWindow.m +++ b/AppKit/NSWindow.m @@ -1573,7 +1573,13 @@ NSString * const NSWindowDidAnimateNotification=@"NSWindowDidAnimateNotification _flushNeeded=YES; else { _flushNeeded=NO; - [[self platformWindow] flushBuffer]; + BOOL doFlush=YES; + + if(([self styleMask]==NSBorderlessWindowMask) && [_contentView isKindOfClass:[NSOpenGLView class]] && [_contentView isOpaque]) + doFlush=NO; + + if(doFlush) + [[self platformWindow] flushBuffer]; } } diff --git a/AppKit/Win32.subproj/CGLContext.m b/AppKit/Win32.subproj/CGLContext.m index 96807bdf..58b4f079 100644 --- a/AppKit/Win32.subproj/CGLContext.m +++ b/AppKit/Win32.subproj/CGLContext.m @@ -404,8 +404,9 @@ CGLError CGLFlushDrawable(CGLContextObj context) { blend.AlphaFormat=AC_SRC_ALPHA; int y=[parentWindow frame].size.height-(context->y+context->h); - + AlphaBlend([deviceContext dc],context->x,y,context->w,context->h,[context->dibSection dc],0,0,context->w,context->h,blend); + } return kCGLNoError; } diff --git a/AppKit/X11.subproj/CGLContext.m b/AppKit/X11.subproj/CGLContext.m index 5de52716..5a72d984 100644 --- a/AppKit/X11.subproj/CGLContext.m +++ b/AppKit/X11.subproj/CGLContext.m @@ -1,5 +1,6 @@ #import #import +#import "X11Display.h" #import #import @@ -8,11 +9,20 @@ #import struct _CGLContextObj { + GLuint retainCount; pthread_mutex_t lock; - Display *dpy; - XVisualInfo *vis; Window window; + Display *display; + XVisualInfo *vis; GLXContext glc; + int x,y,w,h; + GLint opacity; + int windowNumber; +}; + +struct _CGLPixelFormatObj { + GLuint retainCount; + CGLPixelFormatAttribute *attributes; }; static pthread_key_t cglContextKey; @@ -41,36 +51,203 @@ CGL_EXPORT CGLError CGLSetCurrentContext(CGLContextObj context) { if(context==NULL) ;//glXMakeCurrent(NULL, None, NULL); // FIXME: NULL for display? probably crashes else - glXMakeCurrent(context->dpy, context->window, context->glc); + glXMakeCurrent(context->display, context->window, context->glc); return kCGLNoError; } -CGL_EXPORT CGLError CGLCreateContext(CGLPixelFormatObj pixelFormat,Display *dpy,XVisualInfo *vis,Window window,CGLContextObj *resultp) { +static inline bool attributeHasArgument(CGLPixelFormatAttribute attribute){ + switch(attribute){ + case kCGLPFAAuxBuffers: + case kCGLPFAColorSize: + case kCGLPFAAlphaSize: + case kCGLPFADepthSize: + case kCGLPFAStencilSize: + case kCGLPFAAccumSize: + case kCGLPFARendererID: + case kCGLPFADisplayMask: + return TRUE; + + default: + return FALSE; + } +} + +static GLint *addAttribute(GLint *attribList,int *capacity,int *count,GLint value){ + + if(*count>=*capacity){ + *capacity*=2; + attribList=realloc(attribList,*capacity*sizeof(GLint)); + } + + attribList[(*count)++]=value; + + return attribList; +} + +static GLint *attributesFromPixelFormat(CGLPixelFormatObj pixelFormat){ + int resultCapacity=8,resultCount=0; + GLint *result=malloc(resultCapacity*sizeof(GLint)); + int i,virtualScreen=0; + + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_RGBA); + + for(i=0;pixelFormat->attributes[i]!=0;i++){ + CGLPixelFormatAttribute attribute=pixelFormat->attributes[i]; + + if(attributeHasArgument(pixelFormat->attributes[i])) + i++; + + switch(attribute){ + + case kCGLPFAColorSize: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_RED_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/3); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_GREEN_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/3); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_BLUE_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/3); + break; + + case kCGLPFAAlphaSize: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_ALPHA_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]); + break; + + case kCGLPFAAccumSize: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_ACCUM_RED_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/4); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_ACCUM_GREEN_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/4); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_ACCUM_BLUE_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/4); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_ACCUM_ALPHA_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]/4); + break; + + case kCGLPFADepthSize: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_DEPTH_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]); + break; + + case kCGLPFAStencilSize: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_STENCIL_SIZE); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]); + break; + + case kCGLPFAAuxBuffers: + attribList=addAttribute(attribList,&resultCapacity,&resultCount,GLX_AUX_BUFFERS); + attribList=addAttribute(attribList,&resultCapacity,&resultCount,pixelFormat->attributes[i]); + break; + } + + } + attribList=addAttribute(attribList,&resultCapacity,&resultCount,None); +} + +CGL_EXPORT CGLError CGLCreateContext(CGLPixelFormatObj pixelFormat,CGLContextObj share,CGLContextObj *resultp) { + CGLContextObj result=malloc(sizeof(struct _CGLContextObj)); + GLint *attribList=attributesFromPixelFormat(pixelFormat); + + result->display=[(X11Display*)[NSDisplay currentDisplay] display]; + + int screen = DefaultScreen(_display); + + if((_visualInfo=glXChooseVisual(_display,screen,att))==NULL){ + NSLog(@"glXChooseVisual failed"); + return kCGLBadDisplay; + } + + + if(vis==NULL) return kCGLBadDisplay; - CGLContextObj result=malloc(sizeof(struct _CGLContextObj)); + + + + Colormap cmap = XCreateColormap(_display, RootWindow(_display, _visualInfo->screen), _visualInfo->visual, AllocNone); + + if(cmap<0){ + NSLog(@"XCreateColormap failed"); + [self dealloc]; + return nil; + } + + XSetWindowAttributes xattr; + + bzero(&xattr,sizeof(xattr)); + + xattr.colormap=cmap; + xattr.border_pixel = 0; + xattr.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | StructureNotifyMask; + + NSRect frame=[view frame]; + + Window parent=[(X11Window*)[[view window] platformWindow] drawable]; + + if(parent==0) + parent=RootWindow(_display, _visualInfo->screen); + + _window = XCreateWindow(_display,parent, frame.origin.x, frame.origin.y, frame.size.width,frame.size.height, 0, _visualInfo->depth, InputOutput, _visualInfo->visual, CWBorderPixel | CWColormap | CWEventMask, &xattr); + + + // XSetWindowBackgroundPixmap(_display, _window, None); + // [X11Window removeDecorationForWindow:_window onDisplay:_display]; + + XMapWindow(_display, _window); + + + + pthread_mutex_init(&(result->lock),NULL); - result->dpy=dpy; + result->display=display; result->vis=vis; result->window=window; - result->glc=glXCreateContext(result->dpy,result->vis,NULL,GL_TRUE); + result->glc=glXCreateContext(result->display,result->vis,NULL,GL_TRUE); *resultp=result; return kCGLNoError; } -CGL_EXPORT CGLError CGLDestroyContext(CGLContextObj context) { - if(context!=NULL){ +CGL_EXPORT CGLContextObj CGLRetainContext(CGLContextObj context) { + if(context==NULL) + return NULL; + + context->retainCount++; + return context; +} + +CGL_EXPORT void CGLReleaseContext(CGLContextObj context) { + if(context==NULL) + return; + + context->retainCount--; + + if(context->retainCount==0){ if(CGLGetCurrentContext()==context) CGLSetCurrentContext(NULL); + if(_window) + XDestroyWindow(_display, _window); + pthread_mutex_destroy(&(context->lock)); - glXDestroyContext(context->dpy, context->glc); + glXDestroyContext(context->display, context->glc); free(context); } + +} + +CGL_EXPORT GLuint CGLGetContextRetainCount(CGLContextObj context) { + if(context==NULL) + return 0; + + return context->retainCount; +} + +CGL_EXPORT CGLError CGLDestroyContext(CGLContextObj context) { + CGLReleaseContext(context); return kCGLNoError; } @@ -85,11 +262,201 @@ CGL_EXPORT CGLError CGLUnlockContext(CGLContextObj context) { return kCGLNoError; } +static bool usesChildWindow(CGLContextObj context){ + return (context->opacity!=0)?TRUE:FALSE; +} + +static void adjustFrameInParent(CGLContextObj context,Win32Window *parentWindow,GLint *x,GLint *y,GLint *w,GLint *h){ + if(parentWindow!=nil){ + CGFloat top,left,bottom,right; + + CGNativeBorderFrameWidthsForStyle([parentWindow styleMask],&top,&left,&bottom,&right); + + *y=[parentWindow frame].size.height-(*y+*h); + + *y-=top; + *x-=left; + } +} + +static void adjustInParentForSurfaceOpacity(CGLContextObj context){ + GLint x=context->x; + GLint y=context->y; + GLint w=context->w; + GLint h=context->h; + + if(usesChildWindow(context)){ + Win32Window *parentWindow=[Win32Window windowWithWindowNumber:context->windowNumber]; + HWND parentHandle=[parentWindow windowHandle]; + + SetProp(context->window,"self",parentWindow); + SetParent(context->window,parentHandle); + ShowWindow(context->window,SW_SHOWNOACTIVATE); + + adjustFrameInParent(context,parentWindow,&x,&y,&w,&h); + } + else { + ShowWindow(context->window,SW_HIDE); + SetProp(context->window,"self",NULL); + SetParent(context->window,NULL); + } + + MoveWindow(context->window,x,y,w,h,NO); +} + CGL_EXPORT CGLError CGLSetParameter(CGLContextObj context,CGLContextParameter parameter,const GLint *value) { + switch(parameter){ + + case kCGLCPSurfaceFrame:; + context->x=value[0]; + context->y=value[1]; + context->w=value[2]; + context->h=value[3]; + + if(context->imagePixelData!=NULL){ + [context->dibSection release]; + context->imagePixelData=NULL; + } + + context->dibSection=[[O2DeviceContext_gdiDIBSection alloc] initWithWidth:context->w height:-context->h deviceContext:nil]; + context->imagePixelData=[context->dibSection bitmapBytes]; + adjustInParentForSurfaceOpacity(context); + break; + + case kCGLCPSurfaceOpacity: + context->opacity=*value; + adjustInParentForSurfaceOpacity(context); + break; + + case kCGLCPWindowNumber: + context->windowNumber=*value; + adjustInParentForSurfaceOpacity(context); + break; + + default: + NSUnimplementedFunction(); + break; + } + + return kCGLNoError; + + + + + + + + NSRect frame=[view frame]; + frame=[[view superview] convertRect:frame toView:nil]; + + X11Window *wnd=(X11Window*)[[view window] platformWindow]; + NSRect wndFrame=[wnd frame]; + + frame.origin.y=wndFrame.size.height-(frame.origin.y+frame.size.height); + + XMoveResizeWindow(_display, _window, frame.origin.x, frame.origin.y, frame.size.width, frame.size.height); + Window viewWindow=[(X11Window*)[[view window] platformWindow] drawable]; + if(_lastParent!=viewWindow) { + XReparentWindow(_display, _window, viewWindow, frame.origin.x, frame.origin.y); + _lastParent=viewWindow; + } + + return kCGLNoError; } -CGL_EXPORT CGLError CGLGetParameter(CGLContextObj context,CGLContextParameter parameter,GLint *value) { +CGL_EXPORT CGLError CGLGetParameter(CGLContextObj context,CGLContextParameter parameter,GLint *value) { + switch(parameter){ + + case kCGLCPSurfaceOpacity: + *value=context->opacity; + break; + + default: + break; + } + return kCGLNoError; } +CGLError CGLFlushDrawable(CGLContextObj context) { + glXSwapBuffers(_display, _window); +} + +static int attributesCount(const CGLPixelFormatAttribute *attributes){ + int result; + + for(result=0;attributes[result]!=0;result++) + if(attributeHasArgument(attributes[result])) + result++; + + return result; +} + +CGLError CGLChoosePixelFormat(const CGLPixelFormatAttribute *attributes,CGLPixelFormatObj *pixelFormatp,GLint *numberOfScreensp) { + CGLPixelFormatObj result=malloc(sizeof(struct _CGLPixelFormatObj)); + int i,count=attributesCount(attributes); + + result->retainCount=1; + result->attributes=malloc(sizeof(CGLPixelFormatAttribute)*count); + for(i=0;iattributes[i]=attributes[i]; + + *pixelFormatp=result; + *numberOfScreensp=1; + + return kCGLNoError; +} + +CGLPixelFormatObj CGLRetainPixelFormat(CGLPixelFormatObj pixelFormat) { + if(pixelFormat==NULL) + return NULL; + + pixelFormat->retainCount++; + return pixelFormat; +} + +void CGLReleasePixelFormat(CGLPixelFormatObj pixelFormat) { + if(pixelFormat==NULL) + return; + + pixelFormat->retainCount--; + + if(pixelFormat->retainCount==0){ + free(pixelFormat->attributes); + free(pixelFormat); + } +} + +CGLError CGLDestroyPixelFormat(CGLPixelFormatObj pixelFormat) { + CGLReleasePixelFormat(pixelFormat); + return kCGLNoError; +} + +GLuint CGLGetPixelFormatRetainCount(CGLPixelFormatObj pixelFormat) { + return pixelFormat->retainCount; +} + +CGL_EXPORT CGLError CGLDescribePixelFormat(CGLPixelFormatObj pixelFormat,GLint screenNumber,CGLPixelFormatAttribute attribute,GLint *valuesp) { + int i; + + for(i=0;pixelFormat->attributes[i]!=0;i++){ + bool hasArgument=attributeHasArgument(pixelFormat->attributes[i]); + + if(pixelFormat->attributes[i]==attribute){ + if(hasArgument) + *valuesp=pixelFormat->attributes[i+1]; + else + *valuesp=1; + + return kCGLNoError; + } + + if(hasArgument) + i++; + } + *valuesp=0; + return kCGLNoError; +} + + diff --git a/CFNetwork/CFNetwork.xcodeproj/project.pbxproj b/CFNetwork/CFNetwork.xcodeproj/project.pbxproj index 5ce44346..bf4cfb11 100644 --- a/CFNetwork/CFNetwork.xcodeproj/project.pbxproj +++ b/CFNetwork/CFNetwork.xcodeproj/project.pbxproj @@ -8,6 +8,11 @@ /* Begin PBXBuildFile section */ FE74338610A89A9D004CDF00 /* CFNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = FE74338510A89A9D004CDF00 /* CFNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE849306119AF77F00E252CC /* CFNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = FE74338510A89A9D004CDF00 /* CFNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE849307119AF77F00E252CC /* CFSocketStream.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC121A810EFC6C000FD1B47 /* CFSocketStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE849308119AF77F00E252CC /* CFNetServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC121CC10EFC89500FD1B47 /* CFNetServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE849309119AF77F00E252CC /* CFHost.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC121D610EFC92800FD1B47 /* CFHost.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE84930A119AF77F00E252CC /* CFNetworkExport.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC1221810EFCB9A00FD1B47 /* CFNetworkExport.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEA752EA114EB30B00AF634E /* CFNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = FE74338510A89A9D004CDF00 /* CFNetwork.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEA752EB114EB30B00AF634E /* CFSocketStream.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC121A810EFC6C000FD1B47 /* CFSocketStream.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEA752EC114EB30B00AF634E /* CFNetServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC121CC10EFC89500FD1B47 /* CFNetServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -33,6 +38,14 @@ outputFiles = ( ); }; + FE84930B119AF77F00E252CC /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = org.cocotron.1.0.freebsd.i386.gcc.default; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; FEA752EF114EB30B00AF634E /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = org.cocotron.1.0.windows.i386.gcc.default; @@ -49,6 +62,8 @@ 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8DC2EF5B0486A6940098B216 /* CFNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE74338510A89A9D004CDF00 /* CFNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetwork.h; sourceTree = ""; }; + FE84930F119AF77F00E252CC /* CFNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FE849310119AF77F00E252CC /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = ""; }; FEA752F3114EB30B00AF634E /* CFNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FEC121A810EFC6C000FD1B47 /* CFSocketStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFSocketStream.h; sourceTree = ""; }; FEC121CC10EFC89500FD1B47 /* CFNetServices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetServices.h; sourceTree = ""; }; @@ -64,6 +79,7 @@ 8DC2EF5B0486A6940098B216 /* CFNetwork.framework */, FEA752F3114EB30B00AF634E /* CFNetwork.framework */, FEC32E40115909B30008ECE5 /* CFNetwork.framework */, + FE84930F119AF77F00E252CC /* CFNetwork.framework */, ); name = Products; sourceTree = ""; @@ -98,6 +114,7 @@ children = ( 8DC2EF5A0486A6940098B216 /* Info.plist */, 089C1666FE841158C02AAC07 /* InfoPlist.strings */, + FE849310119AF77F00E252CC /* Info copy.plist */, ); name = Resources; sourceTree = ""; @@ -139,6 +156,18 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FE849305119AF77F00E252CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + FE849306119AF77F00E252CC /* CFNetwork.h in Headers */, + FE849307119AF77F00E252CC /* CFSocketStream.h in Headers */, + FE849308119AF77F00E252CC /* CFNetServices.h in Headers */, + FE849309119AF77F00E252CC /* CFHost.h in Headers */, + FE84930A119AF77F00E252CC /* CFNetworkExport.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEA752E9114EB30B00AF634E /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -183,6 +212,23 @@ productReference = 8DC2EF5B0486A6940098B216 /* CFNetwork.framework */; productType = "com.apple.product-type.framework"; }; + FE849304119AF77F00E252CC /* CFNetwork-FreeBSD-i386 */ = { + isa = PBXNativeTarget; + buildConfigurationList = FE84930C119AF77F00E252CC /* Build configuration list for PBXNativeTarget "CFNetwork-FreeBSD-i386" */; + buildPhases = ( + FE849305119AF77F00E252CC /* Headers */, + ); + buildRules = ( + FE84930B119AF77F00E252CC /* PBXBuildRule */, + ); + dependencies = ( + ); + name = "CFNetwork-FreeBSD-i386"; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = CFNetwork; + productReference = FE84930F119AF77F00E252CC /* CFNetwork.framework */; + productType = "com.apple.product-type.framework"; + }; FEA752E8114EB30B00AF634E /* CFNetwork-Linux-i386 */ = { isa = PBXNativeTarget; buildConfigurationList = FEA752F0114EB30B00AF634E /* Build configuration list for PBXNativeTarget "CFNetwork-Linux-i386" */; @@ -232,6 +278,7 @@ 8DC2EF4F0486A6940098B216 /* CFNetwork-Windows-i386 */, FEA752E8114EB30B00AF634E /* CFNetwork-Linux-i386 */, FEC32E35115909B30008ECE5 /* CFNetwork-Darwin-i386 */, + FE849304119AF77F00E252CC /* CFNetwork-FreeBSD-i386 */, ); }; /* End PBXProject section */ @@ -314,6 +361,44 @@ }; name = Release; }; + FE84930D119AF77F00E252CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; + INFOPLIST_FILE = Info.plist; + INSTALL_MODE_FLAG = "og-w,a+rX"; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; + OTHER_CFLAGS = "-DCFNETWORK_INSIDE_BUILD"; + PRODUCT_NAME = CFNetwork; + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = YES; + SYMROOT = build/FreeBSD/i386; + }; + name = Debug; + }; + FE84930E119AF77F00E252CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; + INFOPLIST_FILE = Info.plist; + INSTALL_MODE_FLAG = "og-w,a+rX"; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; + OTHER_CFLAGS = "-DCFNETWORK_INSIDE_BUILD"; + PRODUCT_NAME = CFNetwork; + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = YES; + SYMROOT = build/FreeBSD/i386; + }; + name = Release; + }; FEA752F1114EB30B00AF634E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -411,6 +496,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + FE84930C119AF77F00E252CC /* Build configuration list for PBXNativeTarget "CFNetwork-FreeBSD-i386" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FE84930D119AF77F00E252CC /* Debug */, + FE84930E119AF77F00E252CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; FEA752F0114EB30B00AF634E /* Build configuration list for PBXNativeTarget "CFNetwork-Linux-i386" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/CoreGraphics/CoreGraphics.xcodeproj/project.pbxproj b/CoreGraphics/CoreGraphics.xcodeproj/project.pbxproj index 2ae5253f..dd251df6 100644 --- a/CoreGraphics/CoreGraphics.xcodeproj/project.pbxproj +++ b/CoreGraphics/CoreGraphics.xcodeproj/project.pbxproj @@ -1006,6 +1006,13 @@ remoteGlobalIDString = FEA82925109B75D600C7A732; remoteInfo = "CoreFoundation-Darwin-i386"; }; + FE8493E6119B043500E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE5C0BE711629FD900065D1C /* Onyx2D.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE5C0CA81162A9AB00065D1C; + remoteInfo = "Onyx2D-FreeBSD-i386"; + }; FE8F93BC0FE344D6003F38A6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FE6F7BC00FD5572F00C3244F /* Foundation.xcodeproj */; @@ -2014,6 +2021,7 @@ dependencies = ( FE5A887010C6F2AD005E348A /* PBXTargetDependency */, FE5A887210C6F2B1005E348A /* PBXTargetDependency */, + FE8493E7119B043500E252CC /* PBXTargetDependency */, ); name = "CoreGraphics-FreeBSD-i386"; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -2712,6 +2720,11 @@ name = "CoreFoundation-Darwin-i386"; targetProxy = FE74351110A8BEAB004CDF00 /* PBXContainerItemProxy */; }; + FE8493E7119B043500E252CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Onyx2D-FreeBSD-i386"; + targetProxy = FE8493E6119B043500E252CC /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/CoreServices/CoreServices.xcodeproj/project.pbxproj b/CoreServices/CoreServices.xcodeproj/project.pbxproj index 64f33751..9b313492 100644 --- a/CoreServices/CoreServices.xcodeproj/project.pbxproj +++ b/CoreServices/CoreServices.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; FE7433A910A89ED7004CDF00 /* CoreServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FE7433A810A89ED7004CDF00 /* CoreServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE8492E8119A5EA000E252CC /* CoreServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FE7433A810A89ED7004CDF00 /* CoreServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FE8492EA119A5EA000E252CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; FEC32E49115909F00008ECE5 /* CoreServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FE7433A810A89ED7004CDF00 /* CoreServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; FEC32E4B115909F00008ECE5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; FEC32E5B11590A130008ECE5 /* CoreServices.h in Headers */ = {isa = PBXBuildFile; fileRef = FE7433A810A89ED7004CDF00 /* CoreServices.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -24,6 +26,14 @@ outputFiles = ( ); }; + FE8492ED119A5EA000E252CC /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = org.cocotron.1.0.freebsd.i386.gcc.default; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; FEC32E6811590A4C0008ECE5 /* PBXBuildRule */ = { isa = PBXBuildRule; compilerSpec = org.cocotron.1.0.linux.i386.gcc.default; @@ -56,6 +66,20 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = "CFNetwork-Windows-i386"; }; + FE849312119AF77F00E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE7433AE10A89F5D004CDF00 /* CFNetwork.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = FE84930F119AF77F00E252CC; + remoteInfo = "CFNetwork-Linux-i386 copy"; + }; + FE84931B119AF7C900E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE7433AE10A89F5D004CDF00 /* CFNetwork.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE849304119AF77F00E252CC; + remoteInfo = "CFNetwork-FreeBSD-i386"; + }; FEC32E43115909B30008ECE5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FE7433AE10A89F5D004CDF00 /* CFNetwork.xcodeproj */; @@ -86,6 +110,8 @@ 8DC2EF5B0486A6940098B216 /* CoreServices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreServices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE7433A810A89ED7004CDF00 /* CoreServices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreServices.h; sourceTree = ""; }; FE7433AE10A89F5D004CDF00 /* CFNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CFNetwork.xcodeproj; path = ../CFNetwork/CFNetwork.xcodeproj; sourceTree = SOURCE_ROOT; }; + FE8492F1119A5EA000E252CC /* CoreServices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreServices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FE8492F2119A5EA000E252CC /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = ""; }; FEC32E52115909F00008ECE5 /* CoreServices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreServices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FEC32E6311590A130008ECE5 /* CoreServices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreServices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -98,6 +124,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FE8492EC119A5EA000E252CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEC32E4D115909F00008ECE5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -121,6 +154,7 @@ 8DC2EF5B0486A6940098B216 /* CoreServices.framework */, FEC32E52115909F00008ECE5 /* CoreServices.framework */, FEC32E6311590A130008ECE5 /* CoreServices.framework */, + FE8492F1119A5EA000E252CC /* CoreServices.framework */, ); name = Products; sourceTree = ""; @@ -152,6 +186,7 @@ children = ( 8DC2EF5A0486A6940098B216 /* Info.plist */, 089C1666FE841158C02AAC07 /* InfoPlist.strings */, + FE8492F2119A5EA000E252CC /* Info copy.plist */, ); name = Resources; sourceTree = ""; @@ -184,6 +219,7 @@ FE7433B310A89F5D004CDF00 /* CFNetwork.framework */, FE1342D31151843000404745 /* CFNetwork.framework */, FEC32E44115909B30008ECE5 /* CFNetwork.framework */, + FE849313119AF77F00E252CC /* CFNetwork.framework */, ); name = Products; sourceTree = ""; @@ -199,6 +235,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FE8492E7119A5EA000E252CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + FE8492E8119A5EA000E252CC /* CoreServices.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEC32E48115909F00008ECE5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -239,6 +283,27 @@ productReference = 8DC2EF5B0486A6940098B216 /* CoreServices.framework */; productType = "com.apple.product-type.framework"; }; + FE8492E4119A5EA000E252CC /* CoreServices-FreeBSD-i386 */ = { + isa = PBXNativeTarget; + buildConfigurationList = FE8492EE119A5EA000E252CC /* Build configuration list for PBXNativeTarget "CoreServices-FreeBSD-i386" */; + buildPhases = ( + FE8492E7119A5EA000E252CC /* Headers */, + FE8492E9119A5EA000E252CC /* Resources */, + FE8492EB119A5EA000E252CC /* Sources */, + FE8492EC119A5EA000E252CC /* Frameworks */, + ); + buildRules = ( + FE8492ED119A5EA000E252CC /* PBXBuildRule */, + ); + dependencies = ( + FE84931C119AF7C900E252CC /* PBXTargetDependency */, + ); + name = "CoreServices-FreeBSD-i386"; + productInstallPath = "$(HOME)/Library/Frameworks"; + productName = CoreServices; + productReference = FE8492F1119A5EA000E252CC /* CoreServices.framework */; + productType = "com.apple.product-type.framework"; + }; FEC32E45115909F00008ECE5 /* CoreServices-Darwin-i386 */ = { isa = PBXNativeTarget; buildConfigurationList = FEC32E4F115909F00008ECE5 /* Build configuration list for PBXNativeTarget "CoreServices-Darwin-i386" */; @@ -302,6 +367,7 @@ 8DC2EF4F0486A6940098B216 /* CoreServices-Windows-i386 */, FEC32E45115909F00008ECE5 /* CoreServices-Darwin-i386 */, FEC32E5711590A130008ECE5 /* CoreServices-Linux-i386 */, + FE8492E4119A5EA000E252CC /* CoreServices-FreeBSD-i386 */, ); }; /* End PBXProject section */ @@ -321,6 +387,13 @@ remoteRef = FE7433B210A89F5D004CDF00 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + FE849313119AF77F00E252CC /* CFNetwork.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CFNetwork.framework; + remoteRef = FE849312119AF77F00E252CC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; FEC32E44115909B30008ECE5 /* CFNetwork.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -339,6 +412,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FE8492E9119A5EA000E252CC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + FE8492EA119A5EA000E252CC /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEC32E4A115909F00008ECE5 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -365,6 +446,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FE8492EB119A5EA000E252CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEC32E4C115909F00008ECE5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -387,6 +475,11 @@ name = "CFNetwork-Windows-i386"; targetProxy = FE7433B410A89F63004CDF00 /* PBXContainerItemProxy */; }; + FE84931C119AF7C900E252CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CFNetwork-FreeBSD-i386"; + targetProxy = FE84931B119AF7C900E252CC /* PBXContainerItemProxy */; + }; FEC32E6A11590A7E0008ECE5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "CFNetwork-Darwin-i386"; @@ -477,6 +570,46 @@ }; name = Release; }; + FE8492EF119A5EA000E252CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; + EXECUTABLE_SUFFIX = .1.0.dll; + INFOPLIST_FILE = Info.plist; + INSTALL_MODE_FLAG = "og-w,a+rX"; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; + OTHER_CFLAGS = "-DCORESERVICES_INSIDE_BUILD"; + PRODUCT_NAME = CoreServices; + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = YES; + SYMROOT = build/FreeBSD/i386; + }; + name = Debug; + }; + FE8492F0119A5EA000E252CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; + EXECUTABLE_SUFFIX = .1.0.dll; + INFOPLIST_FILE = Info.plist; + INSTALL_MODE_FLAG = "og-w,a+rX"; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; + OTHER_CFLAGS = "-DCORESERVICES_INSIDE_BUILD"; + PRODUCT_NAME = CoreServices; + SDKROOT = ""; + STRIP_INSTALLED_PRODUCT = YES; + SYMROOT = build/FreeBSD/i386; + }; + name = Release; + }; FEC32E50115909F00008ECE5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -578,6 +711,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + FE8492EE119A5EA000E252CC /* Build configuration list for PBXNativeTarget "CoreServices-FreeBSD-i386" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FE8492EF119A5EA000E252CC /* Debug */, + FE8492F0119A5EA000E252CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; FEC32E4F115909F00008ECE5 /* Build configuration list for PBXNativeTarget "CoreServices-Darwin-i386" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Foundation/Foundation.xcodeproj/project.pbxproj b/Foundation/Foundation.xcodeproj/project.pbxproj index 4c415838..6fb62276 100644 --- a/Foundation/Foundation.xcodeproj/project.pbxproj +++ b/Foundation/Foundation.xcodeproj/project.pbxproj @@ -6532,6 +6532,20 @@ remoteGlobalIDString = FE651A9D0FBC84DD00464BFD; remoteInfo = "objc-Darwin-i386 copy"; }; + FE8492F4119A5EA100E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE1342BD1151842200404745 /* CoreServices.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = FE8492F1119A5EA000E252CC; + remoteInfo = "CoreServices-Linux-i386 copy"; + }; + FE8492F8119A5EE900E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE1342BD1151842200404745 /* CoreServices.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE8492E4119A5EA000E252CC; + remoteInfo = "CoreServices-FreeBSD-i386"; + }; FEA828AA109B74B200C7A732 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FEA828A3109B74B200C7A732 /* CoreFoundation.xcodeproj */; @@ -8526,6 +8540,7 @@ FE1342C91151842200404745 /* CoreServices.framework */, FEC32E56115909F00008ECE5 /* CoreServices.framework */, FEC32E6711590A130008ECE5 /* CoreServices.framework */, + FE8492F5119A5EA100E252CC /* CoreServices.framework */, ); name = Products; sourceTree = ""; @@ -12000,6 +12015,7 @@ dependencies = ( FE5A86D210C6EE82005E348A /* PBXTargetDependency */, FE5A86D410C6EE86005E348A /* PBXTargetDependency */, + FE8492F9119A5EE900E252CC /* PBXTargetDependency */, ); name = "Foundation-FreeBSD-i386"; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -12155,6 +12171,13 @@ remoteRef = FE651AA00FBC84DD00464BFD /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + FE8492F5119A5EA100E252CC /* CoreServices.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CoreServices.framework; + remoteRef = FE8492F4119A5EA100E252CC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; FEA828AB109B74B200C7A732 /* CoreFoundation.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -15786,6 +15809,11 @@ name = "objc-Darwin"; targetProxy = FE6518180FBC844C00464BFD /* PBXContainerItemProxy */; }; + FE8492F9119A5EE900E252CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CoreServices-FreeBSD-i386"; + targetProxy = FE8492F8119A5EE900E252CC /* PBXContainerItemProxy */; + }; FEA828AD109B752F00C7A732 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "CoreFoundation-Windows-i386"; diff --git a/Foundation/platform_bsd/NSPlatform_bsd.m b/Foundation/platform_bsd/NSPlatform_bsd.m index c6157946..2c8b5058 100644 --- a/Foundation/platform_bsd/NSPlatform_bsd.m +++ b/Foundation/platform_bsd/NSPlatform_bsd.m @@ -61,12 +61,12 @@ void NSPlatformSleepThreadForTimeInterval(NSTimeInterval interval) { return [self hostName]; } -NSString *NSPlatformExecutableDirectory=@"BSD"; -NSString *NSPlatformResourceNameSuffix=@"bsd"; +NSString * const NSPlatformExecutableDirectory=@"BSD"; +NSString * const NSPlatformResourceNameSuffix=@"bsd"; -NSString *NSPlatformExecutableFileExtension=@""; -NSString *NSPlatformLoadableObjectFileExtension=@"so"; -NSString *NSPlatformLoadableObjectFilePrefix=@"lib"; +NSString * const NSPlatformExecutableFileExtension=@""; +NSString * const NSPlatformLoadableObjectFileExtension=@"so"; +NSString * const NSPlatformLoadableObjectFilePrefix=@"lib"; - (Class)taskClass { diff --git a/Foundation/platform_posix/NSPlatform_posix.m b/Foundation/platform_posix/NSPlatform_posix.m index 995053fe..adb40cd6 100755 --- a/Foundation/platform_posix/NSPlatform_posix.m +++ b/Foundation/platform_posix/NSPlatform_posix.m @@ -37,6 +37,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #include #include #include +#import BOOL NSCurrentLocaleIsMetric(){ return NO; diff --git a/Foundation/platform_posix/NSTimeZone_posix.m b/Foundation/platform_posix/NSTimeZone_posix.m index d92a4ec3..d0ee4a50 100755 --- a/Foundation/platform_posix/NSTimeZone_posix.m +++ b/Foundation/platform_posix/NSTimeZone_posix.m @@ -187,7 +187,10 @@ NSInteger sortTransitions(id trans1, id trans2, void *context) { systemTimeZone = [self timeZoneWithName:timeZoneName]; } - + +#ifdef LINUX +// FIXME: BSD does not have 'timezone' or __timezone + if (systemTimeZone == nil) { NSString *abbreviation; @@ -208,6 +211,7 @@ NSInteger sortTransitions(id trans1, id trans2, void *context) { systemTimeZone = [NSTimeZone timeZoneForSecondsFromGMT:-timezone]; } } +#endif return systemTimeZone; } diff --git a/Onyx2D/Onyx2D.xcodeproj/project.pbxproj b/Onyx2D/Onyx2D.xcodeproj/project.pbxproj index e301e127..bcb50dd4 100644 --- a/Onyx2D/Onyx2D.xcodeproj/project.pbxproj +++ b/Onyx2D/Onyx2D.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ }; FE5C0D421162A9AB00065D1C /* PBXBuildRule */ = { isa = PBXBuildRule; - compilerSpec = org.cocotron.1.0.windows.i386.gcc.default; + compilerSpec = org.cocotron.1.0.freebsd.i386.gcc.default; fileType = sourcecode.c; isEditable = 1; outputFiles = ( @@ -695,6 +695,13 @@ remoteGlobalIDString = FE01A5970C5D9B6900AEA51A; remoteInfo = "Foundation-Windows-i386"; }; + FE8493EA119B044A00E252CC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FE081BAA118A165F0026A20E /* Foundation.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = FE30A04F10C6ED6F00A1BF7F; + remoteInfo = "Foundation-FreeBSD-i386"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1506,6 +1513,7 @@ FE5C0D421162A9AB00065D1C /* PBXBuildRule */, ); dependencies = ( + FE8493EB119B044A00E252CC /* PBXTargetDependency */, ); name = "Onyx2D-FreeBSD-i386"; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -1977,6 +1985,11 @@ name = "Foundation-Windows-i386"; targetProxy = FE081BC9118A16710026A20E /* PBXContainerItemProxy */; }; + FE8493EB119B044A00E252CC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Foundation-FreeBSD-i386"; + targetProxy = FE8493EA119B044A00E252CC /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -2148,12 +2161,7 @@ "-D__LITTLE_ENDIAN__", "-Wreturn-type", ); - OTHER_LDFLAGS = ( - "-shared", - "-Wl,--enable-auto-import", - "-Wl,--export-all-symbols", - "-Wl,--out-implib,$TARGET_BUILD_DIR/$(PRODUCT_NAME).framework/lib$(PRODUCT_NAME).a", - ); + OTHER_LDFLAGS = "-shared"; PREBINDING = NO; PRODUCT_NAME = Onyx2D; STRIP_INSTALLED_PRODUCT = YES; @@ -2170,7 +2178,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; EXECUTABLE_SUFFIX = .1.0.dll; - FRAMEWORK_SEARCH_PATHS = /Developer/Cocotron/1.0/Windows/i386/Frameworks; + FRAMEWORK_SEARCH_PATHS = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -2181,7 +2189,7 @@ GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "og-w,a+rX"; - INSTALL_PATH = /Developer/Cocotron/1.0/Windows/i386/Frameworks; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; OTHER_CFLAGS = ( "-DONYX2D_INSIDE_BUILD", "-D__LITTLE_ENDIAN__", @@ -2196,7 +2204,7 @@ PREBINDING = NO; PRODUCT_NAME = Onyx2D; STRIP_INSTALLED_PRODUCT = YES; - SYMROOT = build/Windows/i386; + SYMROOT = build/FreeBSD/i386; }; name = Debug; }; @@ -2209,7 +2217,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; EXECUTABLE_SUFFIX = .1.0.dll; - FRAMEWORK_SEARCH_PATHS = /Developer/Cocotron/1.0/Windows/i386/Frameworks; + FRAMEWORK_SEARCH_PATHS = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -2220,22 +2228,17 @@ GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "og-w,a+rX"; - INSTALL_PATH = /Developer/Cocotron/1.0/Windows/i386/Frameworks; + INSTALL_PATH = /Developer/Cocotron/1.0/FreeBSD/i386/Frameworks; OTHER_CFLAGS = ( "-DONYX2D_INSIDE_BUILD", "-D__LITTLE_ENDIAN__", "-Wreturn-type", ); - OTHER_LDFLAGS = ( - "-shared", - "-Wl,--enable-auto-import", - "-Wl,--export-all-symbols", - "-Wl,--out-implib,$TARGET_BUILD_DIR/$(PRODUCT_NAME).framework/lib$(PRODUCT_NAME).a", - ); + OTHER_LDFLAGS = "-shared"; PREBINDING = NO; PRODUCT_NAME = Onyx2D; STRIP_INSTALLED_PRODUCT = YES; - SYMROOT = build/Windows/i386; + SYMROOT = build/FreeBSD/i386; }; name = Release; }; diff --git a/QuartzCore/CALayer.m b/QuartzCore/CALayer.m index 3688adfd..8ef0af2a 100644 --- a/QuartzCore/CALayer.m +++ b/QuartzCore/CALayer.m @@ -6,6 +6,7 @@ return [[[self alloc] init] autorelease]; } +#if 0 @synthesize superLayer=_superLayer; @synthesize sublayers=_sublayers; @synthesize delegate=_delegate; @@ -16,6 +17,7 @@ @synthesize contents=_contents; @synthesize transform=_transform; @synthesize sublayerTransform=_sublayerTransform; +#endif -init { _superLayer=nil; diff --git a/QuartzCore/CARenderer.m b/QuartzCore/CARenderer.m index 44083a97..521725a3 100644 --- a/QuartzCore/CARenderer.m +++ b/QuartzCore/CARenderer.m @@ -4,8 +4,10 @@ @implementation CARenderer +#if 0 @synthesize bounds=_bounds; @synthesize layer=_rootLayer; +#endif -initWithCGLContext:(void *)cglContext options:(NSDictionary *)options { _cglContext=cglContext; diff --git a/objc/objc_class.m b/objc/objc_class.m index 86ebc384..de0d6f4a 100755 --- a/objc/objc_class.m +++ b/objc/objc_class.m @@ -11,6 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #import "objc_malloc.h" #import "ObjCException.h" #import "ObjCModule.h" +#import #import #import "objc_cache.h" #import @@ -22,7 +23,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #ifdef SOLARIS #import #endif -#import #import