diff --git a/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3 b/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3 index e5e1102eb..032e6e618 100644 --- a/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3 +++ b/build/Xcode/CommanderGenius.xcodeproj/az.mode1v3 @@ -216,10 +216,10 @@ _historyCapacity 0 bookmark - 23D3EC2C10166D64001643FA + 23D3EC7310169869001643FA history - 23D3EAA51013BA9B001643FA + 23D3EC2C10166D64001643FA SplitCount @@ -272,6 +272,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -309,7 +311,6 @@ 20286C29FDCF999611CA2CEA 20286C2AFDCF999611CA2CEA - 23D3E9E31013ABCA001643FA 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 1C37FABC05509CD000000102 @@ -317,14 +318,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 52 - 42 + 45 2 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 542}, {186, 581}} + {{0, 0}, {186, 581}} PBXTopSmartGroupGIDs @@ -354,14 +354,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - menu.cpp + CMusic.cpp PBXSplitModuleInNavigatorKey Split0 @@ -369,23 +367,27 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - menu.cpp + CMusic.cpp _historyCapacity 0 bookmark - 23D3EC2A10166D64001643FA + 23D3EC7210169869001643FA history 23D3EC2310166D64001643FA 23D3EC2410166D64001643FA 23D3EC2510166D64001643FA - 23D3EC2610166D64001643FA + 23D3EC58101697CE001643FA + 23D3EC59101697CE001643FA + 23D3EC5A101697CE001643FA prevStack 23D3EC2710166D64001643FA 23D3EC2810166D64001643FA 23D3EC2910166D64001643FA + 23D3EC5B101697CE001643FA + 23D3EC5C101697CE001643FA SplitCount @@ -443,9 +445,9 @@ TableOfContents - 23D3EA8A1013AEC5001643FA + 23D3EC361016966E001643FA 1CE0B1FE06471DED0097A5F4 - 23D3EA8B1013AEC5001643FA + 23D3EC371016966E001643FA 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -579,11 +581,10 @@ 5 WindowOrderList - 1C530D57069F1CE1000CFCEE - 23D3EC2D10166D64001643FA - 23D3EC2E10166D64001643FA - 1CD10A99069EF8BA00B06720 + 23D3EC7410169869001643FA + 23D3EC7510169869001643FA 1C78EAAD065D492600B07095 + 1CD10A99069EF8BA00B06720 23D3EAAD1014760E001643FA /Users/az/Programmierung/CommanderGenius/build/Xcode/CommanderGenius.xcodeproj 23D3EA5A1013ABF8001643FA @@ -605,14 +606,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - COpenGL.cpp + oggsupport.cpp StatusBarVisibility @@ -621,7 +620,7 @@ Frame {{0, 0}, {771, 245}} RubberWindowFrame - 390 137 771 527 0 0 1280 778 + 392 217 771 527 0 0 1280 778 Module PBXNavigatorGroup @@ -629,6 +628,8 @@ 245pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -645,7 +646,7 @@ Frame {{0, 250}, {771, 236}} RubberWindowFrame - 390 137 771 527 0 0 1280 778 + 392 217 771 527 0 0 1280 778 Module PBXBuildResultsModule @@ -668,14 +669,14 @@ TableOfContents 23D3EA5A1013ABF8001643FA - 23D3EA5B1013ABF8001643FA + 23D3EC5F101697CE001643FA 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID ToolbarConfiguration xcode.toolbar.config.buildV3 WindowString - 390 137 771 527 0 0 1280 778 + 392 217 771 527 0 0 1280 778 WindowToolGUID 23D3EA5A1013ABF8001643FA WindowToolIsVisible @@ -710,8 +711,8 @@ yes sizes - {{0, 0}, {316, 185}} - {{316, 0}, {378, 185}} + {{0, 0}, {316, 194}} + {{316, 0}, {378, 194}} VerticalSplitView @@ -726,8 +727,8 @@ yes sizes - {{0, 0}, {694, 185}} - {{0, 185}, {694, 196}} + {{0, 0}, {694, 194}} + {{0, 194}, {694, 187}} @@ -760,7 +761,7 @@ 148 Frame - {{316, 0}, {378, 185}} + {{316, 0}, {378, 194}} RubberWindowFrame 238 355 694 422 0 0 1280 778 @@ -788,13 +789,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 23D3EA631013AC5F001643FA + 23D3EC60101697CE001643FA 1C162984064C10D400B95A72 - 23D3EA641013AC5F001643FA - 23D3EA651013AC5F001643FA - 23D3EA661013AC5F001643FA - 23D3EA671013AC5F001643FA - 23D3EA681013AC5F001643FA + 23D3EC61101697CE001643FA + 23D3EC62101697CE001643FA + 23D3EC63101697CE001643FA + 23D3EC64101697CE001643FA + 23D3EC65101697CE001643FA ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -913,8 +914,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -950,7 +949,7 @@ TableOfContents 1C78EAAD065D492600B07095 - 23D3EAA11013AFA9001643FA + 23D3EC66101697CE001643FA 1C78EAAC065D492600B07095 ToolbarConfiguration @@ -960,7 +959,7 @@ WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser b/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser index d3a1024c0..a66467714 100644 --- a/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser +++ b/build/Xcode/CommanderGenius.xcodeproj/az.pbxuser @@ -84,20 +84,31 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 269724487; - PBXWorkspaceStateSaveDate = 269724487; + PBXPerProjectTemplateStateSaveDate = 269915755; + PBXWorkspaceStateSaveDate = 269915755; }; perUserProjectItems = { - 23D3EAA51013BA9B001643FA /* PBXBookmark */ = 23D3EAA51013BA9B001643FA /* PBXBookmark */; - 23D3EC2310166D64001643FA /* PBXTextBookmark */ = 23D3EC2310166D64001643FA /* PBXTextBookmark */; - 23D3EC2410166D64001643FA /* PBXTextBookmark */ = 23D3EC2410166D64001643FA /* PBXTextBookmark */; - 23D3EC2510166D64001643FA /* PBXTextBookmark */ = 23D3EC2510166D64001643FA /* PBXTextBookmark */; - 23D3EC2610166D64001643FA /* PBXTextBookmark */ = 23D3EC2610166D64001643FA /* PBXTextBookmark */; - 23D3EC2710166D64001643FA /* PBXTextBookmark */ = 23D3EC2710166D64001643FA /* PBXTextBookmark */; - 23D3EC2810166D64001643FA /* PBXTextBookmark */ = 23D3EC2810166D64001643FA /* PBXTextBookmark */; - 23D3EC2910166D64001643FA /* PBXTextBookmark */ = 23D3EC2910166D64001643FA /* PBXTextBookmark */; - 23D3EC2A10166D64001643FA /* PBXTextBookmark */ = 23D3EC2A10166D64001643FA /* PBXTextBookmark */; - 23D3EC2C10166D64001643FA /* PBXTextBookmark */ = 23D3EC2C10166D64001643FA /* PBXTextBookmark */; + 23D3EAA51013BA9B001643FA = 23D3EAA51013BA9B001643FA /* PBXBookmark */; + 23D3EC2310166D64001643FA = 23D3EC2310166D64001643FA /* PBXTextBookmark */; + 23D3EC2410166D64001643FA = 23D3EC2410166D64001643FA /* PBXTextBookmark */; + 23D3EC2510166D64001643FA = 23D3EC2510166D64001643FA /* PBXTextBookmark */; + 23D3EC2610166D64001643FA = 23D3EC2610166D64001643FA /* PBXTextBookmark */; + 23D3EC2710166D64001643FA = 23D3EC2710166D64001643FA /* PBXTextBookmark */; + 23D3EC2810166D64001643FA = 23D3EC2810166D64001643FA /* PBXTextBookmark */; + 23D3EC2910166D64001643FA = 23D3EC2910166D64001643FA /* PBXTextBookmark */; + 23D3EC2A10166D64001643FA = 23D3EC2A10166D64001643FA /* PBXTextBookmark */; + 23D3EC2C10166D64001643FA = 23D3EC2C10166D64001643FA /* PBXTextBookmark */; + 23D3EC351016966E001643FA /* PBXTextBookmark */ = 23D3EC351016966E001643FA /* PBXTextBookmark */; + 23D3EC381016966E001643FA /* PBXTextBookmark */ = 23D3EC381016966E001643FA /* PBXTextBookmark */; + 23D3EC58101697CE001643FA /* PBXTextBookmark */ = 23D3EC58101697CE001643FA /* PBXTextBookmark */; + 23D3EC59101697CE001643FA /* PBXTextBookmark */ = 23D3EC59101697CE001643FA /* PBXTextBookmark */; + 23D3EC5A101697CE001643FA /* PBXTextBookmark */ = 23D3EC5A101697CE001643FA /* PBXTextBookmark */; + 23D3EC5B101697CE001643FA /* PBXTextBookmark */ = 23D3EC5B101697CE001643FA /* PBXTextBookmark */; + 23D3EC5C101697CE001643FA /* PBXTextBookmark */ = 23D3EC5C101697CE001643FA /* PBXTextBookmark */; + 23D3EC5D101697CE001643FA /* PBXTextBookmark */ = 23D3EC5D101697CE001643FA /* PBXTextBookmark */; + 23D3EC5E101697CE001643FA /* PBXTextBookmark */ = 23D3EC5E101697CE001643FA /* PBXTextBookmark */; + 23D3EC7210169869001643FA /* PBXTextBookmark */ = 23D3EC7210169869001643FA /* PBXTextBookmark */; + 23D3EC7310169869001643FA /* PBXTextBookmark */ = 23D3EC7310169869001643FA /* PBXTextBookmark */; }; sourceControlManager = 23D3E96C1013AB1D001643FA /* Source Control */; userBuildSettings = { @@ -160,9 +171,9 @@ }; 23D3E9AB1013ABCA001643FA /* game.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {892, 21098}}"; + sepNavIntBoundsRect = "{{0, 0}, {892, 21266}}"; sepNavSelRange = "{185, 12}"; - sepNavVisRange = "{0, 1106}"; + sepNavVisRange = "{0, 1142}"; sepNavWindowFrame = "{{166, -117}, {951, 724}}"; }; }; @@ -173,11 +184,18 @@ sepNavVisRange = "{24326, 257}"; }; }; + 23D3E9B31013ABCA001643FA /* CMusic.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {650, 1890}}"; + sepNavSelRange = "{369, 0}"; + sepNavVisRange = "{214, 318}"; + }; + }; 23D3E9D51013ABCA001643FA /* menu.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {650, 20706}}"; + sepNavIntBoundsRect = "{{0, 0}, {650, 20538}}"; sepNavSelRange = "{20986, 50}"; - sepNavVisRange = "{20803, 473}"; + sepNavVisRange = "{20790, 453}"; }; }; 23D3E9D61013ABCA001643FA /* misc.cpp */ = { @@ -222,6 +240,13 @@ sepNavVisRange = "{75, 231}"; }; }; + 23D3EA8C1013AEF3001643FA /* MacMain.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {650, 5516}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 449}"; + }; + }; 23D3EAA51013BA9B001643FA /* PBXBookmark */ = { isa = PBXBookmark; fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */; @@ -314,6 +339,128 @@ vrLen = 1106; vrLoc = 0; }; + 23D3EC351016966E001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9D51013ABCA001643FA /* menu.cpp */; + name = "menu.cpp: 868"; + rLen = 50; + rLoc = 20986; + rType = 0; + vrLen = 453; + vrLoc = 20790; + }; + 23D3EC381016966E001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */; + name = "game.cpp: 9"; + rLen = 12; + rLoc = 185; + rType = 0; + vrLen = 1142; + vrLoc = 0; + }; + 23D3EC3A101696DF001643FA /* CExeFile.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {710, 3010}}"; + sepNavSelRange = "{969, 0}"; + sepNavVisRange = "{767, 349}"; + }; + }; + 23D3EC431016973A001643FA /* CEGAGraphics.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {710, 1876}}"; + sepNavSelRange = "{2306, 0}"; + sepNavVisRange = "{2138, 415}"; + }; + }; + 23D3EC58101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9D51013ABCA001643FA /* menu.cpp */; + name = "menu.cpp: 868"; + rLen = 50; + rLoc = 20986; + rType = 0; + vrLen = 453; + vrLoc = 20790; + }; + 23D3EC59101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3EA8C1013AEF3001643FA /* MacMain.m */; + name = "MacMain.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 449; + vrLoc = 0; + }; + 23D3EC5A101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "warning: unused variable 'fp'"; + fRef = 23D3E9B31013ABCA001643FA /* CMusic.cpp */; + rLen = 0; + rLoc = 21; + rType = 1; + }; + 23D3EC5B101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9D51013ABCA001643FA /* menu.cpp */; + name = "menu.cpp: 868"; + rLen = 50; + rLoc = 20986; + rType = 0; + vrLen = 453; + vrLoc = 20790; + }; + 23D3EC5C101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3EA8C1013AEF3001643FA /* MacMain.m */; + name = "MacMain.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 449; + vrLoc = 0; + }; + 23D3EC5D101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9B31013ABCA001643FA /* CMusic.cpp */; + name = "CMusic.cpp: 23"; + rLen = 0; + rLoc = 368; + rType = 0; + vrLen = 220; + vrLoc = 214; + }; + 23D3EC5E101697CE001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */; + name = "game.cpp: 9"; + rLen = 12; + rLoc = 185; + rType = 0; + vrLen = 1067; + vrLoc = 0; + }; + 23D3EC7210169869001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9B31013ABCA001643FA /* CMusic.cpp */; + name = "CMusic.cpp: 23"; + rLen = 0; + rLoc = 369; + rType = 0; + vrLen = 318; + vrLoc = 214; + }; + 23D3EC7310169869001643FA /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 23D3E9AB1013ABCA001643FA /* game.cpp */; + name = "game.cpp: 9"; + rLen = 12; + rLoc = 185; + rType = 0; + vrLen = 1142; + vrLoc = 0; + }; 8D0C4E890486CD37000505A6 /* CommanderGenius */ = { activeExec = 0; executables = ( diff --git a/build/Xcode/CommanderGenius.xcodeproj/project.pbxproj b/build/Xcode/CommanderGenius.xcodeproj/project.pbxproj index 80e4213b6..b4054a0ea 100644 --- a/build/Xcode/CommanderGenius.xcodeproj/project.pbxproj +++ b/build/Xcode/CommanderGenius.xcodeproj/project.pbxproj @@ -88,6 +88,14 @@ 23D3EA841013AEB5001643FA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23D3EA831013AEB5001643FA /* OpenGL.framework */; }; 23D3EA8D1013AEF3001643FA /* MacMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EA8C1013AEF3001643FA /* MacMain.m */; }; 23D3EA921013AF1D001643FA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23D3EA911013AF1D001643FA /* Cocoa.framework */; }; + 23D3EC40101696DF001643FA /* CExeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC3A101696DF001643FA /* CExeFile.cpp */; }; + 23D3EC41101696DF001643FA /* CPatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC3C101696DF001643FA /* CPatcher.cpp */; }; + 23D3EC42101696DF001643FA /* CTileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC3E101696DF001643FA /* CTileLoader.cpp */; }; + 23D3EC4D1016973A001643FA /* CEGAGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC431016973A001643FA /* CEGAGraphics.cpp */; }; + 23D3EC4E1016973A001643FA /* CEGALatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC451016973A001643FA /* CEGALatch.cpp */; }; + 23D3EC4F1016973A001643FA /* CEGASprit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC471016973A001643FA /* CEGASprit.cpp */; }; + 23D3EC501016973A001643FA /* CMessages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC491016973A001643FA /* CMessages.cpp */; }; + 23D3EC511016973A001643FA /* CPlanes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23D3EC4B1016973A001643FA /* CPlanes.cpp */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; /* End PBXBuildFile section */ @@ -238,8 +246,24 @@ 23D3EA0C1013ABCA001643FA /* sounds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sounds.h; sourceTree = ""; }; 23D3EA691013AC7B001643FA /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = Library/Frameworks/SDL.framework; sourceTree = SDKROOT; }; 23D3EA831013AEB5001643FA /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; - 23D3EA8C1013AEF3001643FA /* MacMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MacMain.m; sourceTree = ""; }; + 23D3EA8C1013AEF3001643FA /* MacMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MacMain.m; path = ../build/Xcode/MacMain.m; sourceTree = ""; }; 23D3EA911013AF1D001643FA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 23D3EC3A101696DF001643FA /* CExeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CExeFile.cpp; sourceTree = ""; }; + 23D3EC3B101696DF001643FA /* CExeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CExeFile.h; sourceTree = ""; }; + 23D3EC3C101696DF001643FA /* CPatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPatcher.cpp; sourceTree = ""; }; + 23D3EC3D101696DF001643FA /* CPatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPatcher.h; sourceTree = ""; }; + 23D3EC3E101696DF001643FA /* CTileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CTileLoader.cpp; sourceTree = ""; }; + 23D3EC3F101696DF001643FA /* CTileLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTileLoader.h; sourceTree = ""; }; + 23D3EC431016973A001643FA /* CEGAGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CEGAGraphics.cpp; sourceTree = ""; }; + 23D3EC441016973A001643FA /* CEGAGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEGAGraphics.h; sourceTree = ""; }; + 23D3EC451016973A001643FA /* CEGALatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CEGALatch.cpp; sourceTree = ""; }; + 23D3EC461016973A001643FA /* CEGALatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEGALatch.h; sourceTree = ""; }; + 23D3EC471016973A001643FA /* CEGASprit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CEGASprit.cpp; sourceTree = ""; }; + 23D3EC481016973A001643FA /* CEGASprit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEGASprit.h; sourceTree = ""; }; + 23D3EC491016973A001643FA /* CMessages.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CMessages.cpp; sourceTree = ""; }; + 23D3EC4A1016973A001643FA /* CMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMessages.h; sourceTree = ""; }; + 23D3EC4B1016973A001643FA /* CPlanes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPlanes.cpp; sourceTree = ""; }; + 23D3EC4C1016973A001643FA /* CPlanes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPlanes.h; sourceTree = ""; }; 5048396D09E3307300765E4B /* CommanderGeniusProj.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = CommanderGeniusProj.xcconfig; sourceTree = ""; }; 5048396E09E3307300765E4B /* CommanderGeniusTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = CommanderGeniusTarget.xcconfig; sourceTree = ""; }; 508344B209E5C41E0093A071 /* CommanderGenius.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CommanderGenius.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -273,7 +297,7 @@ isa = PBXGroup; children = ( 5048396909E3304600765E4B /* Configuration Files */, - 20286C2AFDCF999611CA2CEA /* Sources */, + 20286C2AFDCF999611CA2CEA /* src */, 20286C2CFDCF999611CA2CEA /* Resources */, 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */, 195DF8CFFE9D517E11CA2CBB /* Products */, @@ -284,7 +308,7 @@ name = CommanderGenius; sourceTree = ""; }; - 20286C2AFDCF999611CA2CEA /* Sources */ = { + 20286C2AFDCF999611CA2CEA /* src */ = { isa = PBXGroup; children = ( 23D3EA8C1013AEF3001643FA /* MacMain.m */, @@ -331,7 +355,8 @@ 23D3E9FD1013ABCA001643FA /* vorbis */, 23D3E9FF1013ABCA001643FA /* vorticon */, ); - name = Sources; + name = src; + path = ../../src; sourceTree = ""; }; 20286C2CFDCF999611CA2CEA /* Resources */ = { @@ -392,6 +417,12 @@ 23D3E9A11013ABCA001643FA /* fileio */ = { isa = PBXGroup; children = ( + 23D3EC3A101696DF001643FA /* CExeFile.cpp */, + 23D3EC3B101696DF001643FA /* CExeFile.h */, + 23D3EC3C101696DF001643FA /* CPatcher.cpp */, + 23D3EC3D101696DF001643FA /* CPatcher.h */, + 23D3EC3E101696DF001643FA /* CTileLoader.cpp */, + 23D3EC3F101696DF001643FA /* CTileLoader.h */, 23D3E9A21013ABCA001643FA /* CParser.cpp */, 23D3E9A31013ABCA001643FA /* CParser.h */, 23D3E9A41013ABCA001643FA /* lzexe.cpp */, @@ -544,6 +575,16 @@ 23D3E9FF1013ABCA001643FA /* vorticon */ = { isa = PBXGroup; children = ( + 23D3EC431016973A001643FA /* CEGAGraphics.cpp */, + 23D3EC441016973A001643FA /* CEGAGraphics.h */, + 23D3EC451016973A001643FA /* CEGALatch.cpp */, + 23D3EC461016973A001643FA /* CEGALatch.h */, + 23D3EC471016973A001643FA /* CEGASprit.cpp */, + 23D3EC481016973A001643FA /* CEGASprit.h */, + 23D3EC491016973A001643FA /* CMessages.cpp */, + 23D3EC4A1016973A001643FA /* CMessages.h */, + 23D3EC4B1016973A001643FA /* CPlanes.cpp */, + 23D3EC4C1016973A001643FA /* CPlanes.h */, 23D3EA001013ABCA001643FA /* CCredits.cpp */, 23D3EA011013ABCA001643FA /* CCredits.h */, 23D3EA021013ABCA001643FA /* CDialog.cpp */, @@ -703,6 +744,14 @@ 23D3EA571013ABCA001643FA /* CObject.cpp in Sources */, 23D3EA581013ABCA001643FA /* CPlayer.cpp in Sources */, 23D3EA8D1013AEF3001643FA /* MacMain.m in Sources */, + 23D3EC40101696DF001643FA /* CExeFile.cpp in Sources */, + 23D3EC41101696DF001643FA /* CPatcher.cpp in Sources */, + 23D3EC42101696DF001643FA /* CTileLoader.cpp in Sources */, + 23D3EC4D1016973A001643FA /* CEGAGraphics.cpp in Sources */, + 23D3EC4E1016973A001643FA /* CEGALatch.cpp in Sources */, + 23D3EC4F1016973A001643FA /* CEGASprit.cpp in Sources */, + 23D3EC501016973A001643FA /* CMessages.cpp in Sources */, + 23D3EC511016973A001643FA /* CPlanes.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -742,6 +791,7 @@ "_GLIBCXX_DEBUG_PEDANTIC=1", ); HEADER_SEARCH_PATHS = /Library/Frameworks/SDL.framework/Headers; + OTHER_CFLAGS = "-DBUILD_SDL"; }; name = Debug; }; @@ -756,6 +806,7 @@ GCC_PREFIX_HEADER = ""; HEADER_SEARCH_PATHS = /Library/Frameworks/SDL.framework/Headers; INSTALL_PATH = "$(HOME)/Applications"; + OTHER_CFLAGS = "-DBUILD_SDL"; PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; }; name = Release; @@ -769,7 +820,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "-DBUILD_SDL"; SDKROOT = macosx10.5; }; name = Debug; @@ -780,7 +830,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; - OTHER_CFLAGS = "-DBUILD_SDL"; SDKROOT = macosx10.5; SEPARATE_STRIP = YES; };