From 59b46cb0bb198cb201506e54af7aedbe47846e03 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 18 Jan 2010 14:50:57 +0000 Subject: [PATCH] Updated Mac OS X projects with new assertion code --- .../SDL/SDLiPhoneOS.xcodeproj/project.pbxproj | 8 +++++++ Xcode/SDL/SDL.xcodeproj/project.pbxproj | 24 ++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj index 946244eec..a4b3ffa2d 100755 --- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj +++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj @@ -63,6 +63,8 @@ 04B2ECFF1025CEB900F9BC5F /* SDL_atomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 04B2ECF11025CEB900F9BC5F /* SDL_atomic.c */; }; 04B2ED081025CF9E00F9BC5F /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B2ED061025CF9E00F9BC5F /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; }; 04EC8B521025D12900431D42 /* SDL_config_iphoneos.h in Headers */ = {isa = PBXBuildFile; fileRef = 04EC8B501025D12900431D42 /* SDL_config_iphoneos.h */; }; + 04F2AF541104ABC300D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF531104ABC300D6DDF7 /* SDL_assert.h */; }; + 04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */; }; FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; }; FD3F495C0DEA5B2100C5B771 /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CC0DD52EB400FB1D6B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; FD3F495D0DEA5B2100C5B771 /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = FD99B8CD0DD52EB400FB1D6B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -240,6 +242,8 @@ 04B2ECF11025CEB900F9BC5F /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = ""; }; 04B2ED061025CF9E00F9BC5F /* SDL_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_config.h; path = ../../include/SDL_config.h; sourceTree = SOURCE_ROOT; }; 04EC8B501025D12900431D42 /* SDL_config_iphoneos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_config_iphoneos.h; path = ../../include/SDL_config_iphoneos.h; sourceTree = SOURCE_ROOT; }; + 04F2AF531104ABC300D6DDF7 /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert.h; path = ../../include/SDL_assert.h; sourceTree = SOURCE_ROOT; }; + 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = SOURCE_ROOT; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -575,6 +579,7 @@ FD99B8BC0DD52E5C00FB1D6B /* Public Headers */ = { isa = PBXGroup; children = ( + 04F2AF531104ABC300D6DDF7 /* SDL_assert.h */, 04B2ECE61025CE4800F9BC5F /* SDL_atomic.h */, FD99B8CC0DD52EB400FB1D6B /* begin_code.h */, FD99B8CD0DD52EB400FB1D6B /* close_code.h */, @@ -622,6 +627,7 @@ FD99B8BD0DD52E6D00FB1D6B /* Library Source */ = { isa = PBXGroup; children = ( + 04F2AF551104ABD200D6DDF7 /* SDL_assert.c */, FD99B9D30DD52EDC00FB1D6B /* SDL_compat.c */, FD99B9D40DD52EDC00FB1D6B /* SDL_error_c.h */, FD99B9D50DD52EDC00FB1D6B /* SDL_error.c */, @@ -916,6 +922,7 @@ 04B2ED081025CF9E00F9BC5F /* SDL_config.h in Headers */, 04EC8B521025D12900431D42 /* SDL_config_iphoneos.h in Headers */, 043DD77010FD8A0000DED673 /* SDL_alphamult.h in Headers */, + 04F2AF541104ABC300D6DDF7 /* SDL_assert.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1095,6 +1102,7 @@ 043DD76F10FD8A0000DED673 /* SDL_alphamult.c in Sources */, 043DD77110FD8A0000DED673 /* SDL_blendfillrect.c in Sources */, 043DD77210FD8A0000DED673 /* SDL_drawrect.c in Sources */, + 04F2AF561104ABD200D6DDF7 /* SDL_assert.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj index fd1f6b60e..5e00827f0 100755 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj @@ -422,6 +422,10 @@ 04DB838D10FD8C81000519B5 /* SDL_drawrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */; }; 04DB838E10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */; }; 04DB838F10FD8C81000519B5 /* SDL_drawrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */; }; + 04F2AF661104AC0800D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF651104AC0800D6DDF7 /* SDL_assert.c */; }; + 04F2AF671104AC0800D6DDF7 /* SDL_assert.c in Sources */ = {isa = PBXBuildFile; fileRef = 04F2AF651104AC0800D6DDF7 /* SDL_assert.c */; }; + 04F2AF691104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; }; + 04F2AF6A1104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; }; BECDF62E0761BA81005FE872 /* SDL_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538330006D78D67F000001 /* SDL_audio.c */; }; BECDF62F0761BA81005FE872 /* SDL_audiocvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538331006D78D67F000001 /* SDL_audiocvt.c */; }; BECDF6300761BA81005FE872 /* SDL_audiodev.c in Sources */ = {isa = PBXBuildFile; fileRef = 01538332006D78D67F000001 /* SDL_audiodev.c */; }; @@ -701,6 +705,8 @@ 046B92100A11B8AD00FB151C /* SDL_dlcompat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_dlcompat.c; sourceTree = ""; }; 04DB838A10FD8C81000519B5 /* SDL_blendfillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendfillrect.c; sourceTree = ""; }; 04DB838B10FD8C81000519B5 /* SDL_drawrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawrect.c; sourceTree = ""; }; + 04F2AF651104AC0800D6DDF7 /* SDL_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_assert.c; path = ../../src/SDL_assert.c; sourceTree = SOURCE_ROOT; }; + 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_assert.h; path = ../../include/SDL_assert.h; sourceTree = SOURCE_ROOT; }; 083E489D006D88D97F000001 /* SDL_joystick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_joystick.c; sourceTree = ""; }; 0C5AF5E501191D2B7F000001 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = begin_code.h; path = ../../include/begin_code.h; sourceTree = SOURCE_ROOT; }; 0C5AF5E601191D2B7F000001 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = close_code.h; path = ../../include/close_code.h; sourceTree = SOURCE_ROOT; }; @@ -1191,6 +1197,7 @@ 0153844A006D81B07F000001 /* Public Headers */ = { isa = PBXGroup; children = ( + 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */, 0C5AF5E501191D2B7F000001 /* begin_code.h */, 0C5AF5E601191D2B7F000001 /* close_code.h */, 0C5AF5FF01191D2B7F000001 /* SDL.h */, @@ -1290,6 +1297,13 @@ 08FB77ACFE841707C02AAC07 /* Library Source */ = { isa = PBXGroup; children = ( + 04F2AF651104AC0800D6DDF7 /* SDL_assert.c */, + 00CFA6FA106B493800758660 /* SDL_compat.c */, + 00CFA6FB106B493800758660 /* SDL_error_c.h */, + 01538438006D7D947F000001 /* SDL_error.c */, + 00CFA6FC106B493800758660 /* SDL_fatal.h */, + 01538439006D7D947F000001 /* SDL_fatal.c */, + 0153843C006D7D947F000001 /* SDL.c */, 00CFA69B106B467B00758660 /* atomic */, 0153832C006D78D67F000001 /* audio */, B24DA50105A88D52006B9F1C /* cpuinfo */, @@ -1303,12 +1317,6 @@ 01538379006D79737F000001 /* thread */, 01538391006D79BC7F000001 /* timer */, 015383BE006D7A567F000001 /* video */, - 00CFA6FA106B493800758660 /* SDL_compat.c */, - 00CFA6FB106B493800758660 /* SDL_error_c.h */, - 01538438006D7D947F000001 /* SDL_error.c */, - 00CFA6FC106B493800758660 /* SDL_fatal.h */, - 01538439006D7D947F000001 /* SDL_fatal.c */, - 0153843C006D7D947F000001 /* SDL.c */, ); name = "Library Source"; sourceTree = ""; @@ -1506,6 +1514,7 @@ 00CFA841106B49B600758660 /* SDL_sysvideo.h in Headers */, 00CFA844106B49B600758660 /* SDL_yuv_sw_c.h in Headers */, 00A6EBDA1078D569001EEA06 /* SDL_revision.h in Headers */, + 04F2AF691104AC4500D6DDF7 /* SDL_assert.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1604,6 +1613,7 @@ 00CFA86F106B49B600758660 /* SDL_sysvideo.h in Headers */, 00CFA872106B49B600758660 /* SDL_yuv_sw_c.h in Headers */, 00A6EBDB1078D569001EEA06 /* SDL_revision.h in Headers */, + 04F2AF6A1104AC4500D6DDF7 /* SDL_assert.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1909,6 +1919,7 @@ 001798D410743B9F00F5D044 /* SDL_power.c in Sources */, 04DB838C10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */, 04DB838D10FD8C81000519B5 /* SDL_drawrect.c in Sources */, + 04F2AF661104AC0800D6DDF7 /* SDL_assert.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2023,6 +2034,7 @@ 001798CE10743B9F00F5D044 /* SDL_power.c in Sources */, 04DB838E10FD8C81000519B5 /* SDL_blendfillrect.c in Sources */, 04DB838F10FD8C81000519B5 /* SDL_drawrect.c in Sources */, + 04F2AF671104AC0800D6DDF7 /* SDL_assert.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };