Fix build on OSX.

This commit is contained in:
Christian Speckner 2017-10-15 21:11:39 +02:00
parent 14dde10b34
commit f40d34543c
1 changed files with 26 additions and 8 deletions

View File

@ -590,12 +590,16 @@
DCFF14CE18B0260300A20364 /* EventHandlerSDL2.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */; }; DCFF14CE18B0260300A20364 /* EventHandlerSDL2.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */; };
DCFFE59D12100E1400DFA000 /* ComboDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */; }; DCFFE59D12100E1400DFA000 /* ComboDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */; };
DCFFE59E12100E1400DFA000 /* ComboDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */; }; DCFFE59E12100E1400DFA000 /* ComboDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */; };
E0306E0C1F93E916003DDD52 /* YStartDetector.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0306E061F93E915003DDD52 /* YStartDetector.cxx */; };
E0306E0D1F93E916003DDD52 /* FrameLayoutDetector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E0306E071F93E915003DDD52 /* FrameLayoutDetector.hxx */; };
E0306E0E1F93E916003DDD52 /* YStartDetector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E0306E081F93E915003DDD52 /* YStartDetector.hxx */; };
E0306E0F1F93E916003DDD52 /* JitterEmulation.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0306E091F93E915003DDD52 /* JitterEmulation.cxx */; };
E0306E101F93E916003DDD52 /* FrameLayoutDetector.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0306E0A1F93E916003DDD52 /* FrameLayoutDetector.cxx */; };
E0306E111F93E916003DDD52 /* JitterEmulation.hxx in Headers */ = {isa = PBXBuildFile; fileRef = E0306E0B1F93E916003DDD52 /* JitterEmulation.hxx */; };
E0406FB61F81A85400A82AE0 /* AbstractFrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */; }; E0406FB61F81A85400A82AE0 /* AbstractFrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */; };
E0406FB71F81A85400A82AE0 /* AbstractFrameManager.hxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */; }; E0406FB71F81A85400A82AE0 /* AbstractFrameManager.hxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */; };
E0406FB81F81A85400A82AE0 /* FrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */; }; E0406FB81F81A85400A82AE0 /* FrameManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */; };
E0406FB91F81A85400A82AE0 /* FrameManager.hxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */; }; E0406FB91F81A85400A82AE0 /* FrameManager.hxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */; };
E0406FBA1F81A85400A82AE0 /* VblankManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7E1F81A358000F3505 /* VblankManager.cxx */; };
E0406FBB1F81A85400A82AE0 /* VblankManager.hxx in Sources */ = {isa = PBXBuildFile; fileRef = E0DFDD7F1F81A358000F3505 /* VblankManager.hxx */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXBuildRule section */ /* Begin PBXBuildRule section */
@ -1235,12 +1239,16 @@
DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = EventHandlerSDL2.hxx; sourceTree = "<group>"; }; DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = EventHandlerSDL2.hxx; sourceTree = "<group>"; };
DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComboDialog.cxx; sourceTree = "<group>"; }; DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComboDialog.cxx; sourceTree = "<group>"; };
DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ComboDialog.hxx; sourceTree = "<group>"; }; DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ComboDialog.hxx; sourceTree = "<group>"; };
E0306E061F93E915003DDD52 /* YStartDetector.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YStartDetector.cxx; sourceTree = "<group>"; };
E0306E071F93E915003DDD52 /* FrameLayoutDetector.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FrameLayoutDetector.hxx; sourceTree = "<group>"; };
E0306E081F93E915003DDD52 /* YStartDetector.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = YStartDetector.hxx; sourceTree = "<group>"; };
E0306E091F93E915003DDD52 /* JitterEmulation.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JitterEmulation.cxx; sourceTree = "<group>"; };
E0306E0A1F93E916003DDD52 /* FrameLayoutDetector.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLayoutDetector.cxx; sourceTree = "<group>"; };
E0306E0B1F93E916003DDD52 /* JitterEmulation.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = JitterEmulation.hxx; sourceTree = "<group>"; };
E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AbstractFrameManager.cxx; sourceTree = "<group>"; }; E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AbstractFrameManager.cxx; sourceTree = "<group>"; };
E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = AbstractFrameManager.hxx; sourceTree = "<group>"; }; E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = AbstractFrameManager.hxx; sourceTree = "<group>"; };
E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrameManager.cxx; sourceTree = "<group>"; }; E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrameManager.cxx; sourceTree = "<group>"; };
E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = FrameManager.hxx; sourceTree = "<group>"; }; E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = FrameManager.hxx; sourceTree = "<group>"; };
E0DFDD7E1F81A358000F3505 /* VblankManager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VblankManager.cxx; sourceTree = "<group>"; };
E0DFDD7F1F81A358000F3505 /* VblankManager.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = VblankManager.hxx; sourceTree = "<group>"; };
F5A47A9D01A0482F01D3D55B /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; }; F5A47A9D01A0482F01D3D55B /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; };
F5A47A9E01A0483001D3D55B /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = SOURCE_ROOT; }; F5A47A9E01A0483001D3D55B /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -2013,12 +2021,16 @@
E0DFDD731F81A358000F3505 /* frame-manager */ = { E0DFDD731F81A358000F3505 /* frame-manager */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E0306E0A1F93E916003DDD52 /* FrameLayoutDetector.cxx */,
E0306E071F93E915003DDD52 /* FrameLayoutDetector.hxx */,
E0306E091F93E915003DDD52 /* JitterEmulation.cxx */,
E0306E0B1F93E916003DDD52 /* JitterEmulation.hxx */,
E0306E061F93E915003DDD52 /* YStartDetector.cxx */,
E0306E081F93E915003DDD52 /* YStartDetector.hxx */,
E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */, E0DFDD781F81A358000F3505 /* AbstractFrameManager.cxx */,
E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */, E0DFDD791F81A358000F3505 /* AbstractFrameManager.hxx */,
E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */, E0DFDD7B1F81A358000F3505 /* FrameManager.cxx */,
E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */, E0DFDD7C1F81A358000F3505 /* FrameManager.hxx */,
E0DFDD7E1F81A358000F3505 /* VblankManager.cxx */,
E0DFDD7F1F81A358000F3505 /* VblankManager.hxx */,
); );
path = "frame-manager"; path = "frame-manager";
sourceTree = "<group>"; sourceTree = "<group>";
@ -2142,6 +2154,7 @@
2D91745209BA90380026E9FF /* CommandDialog.hxx in Headers */, 2D91745209BA90380026E9FF /* CommandDialog.hxx in Headers */,
2D91745309BA90380026E9FF /* CommandMenu.hxx in Headers */, 2D91745309BA90380026E9FF /* CommandMenu.hxx in Headers */,
DCB2ECAE1F0AECA3009738A6 /* BSType.hxx in Headers */, DCB2ECAE1F0AECA3009738A6 /* BSType.hxx in Headers */,
E0306E111F93E916003DDD52 /* JitterEmulation.hxx in Headers */,
2D91745509BA90380026E9FF /* CpuWidget.hxx in Headers */, 2D91745509BA90380026E9FF /* CpuWidget.hxx in Headers */,
2D91745609BA90380026E9FF /* DataGridOpsWidget.hxx in Headers */, 2D91745609BA90380026E9FF /* DataGridOpsWidget.hxx in Headers */,
2D91745709BA90380026E9FF /* DataGridWidget.hxx in Headers */, 2D91745709BA90380026E9FF /* DataGridWidget.hxx in Headers */,
@ -2177,6 +2190,7 @@
DC47455D09C34BFA00EDDA3A /* CheetahCheat.hxx in Headers */, DC47455D09C34BFA00EDDA3A /* CheetahCheat.hxx in Headers */,
DC47455F09C34BFA00EDDA3A /* RamCheat.hxx in Headers */, DC47455F09C34BFA00EDDA3A /* RamCheat.hxx in Headers */,
DCD56D390B247D920092F9F8 /* Cart4A50.hxx in Headers */, DCD56D390B247D920092F9F8 /* Cart4A50.hxx in Headers */,
E0306E0D1F93E916003DDD52 /* FrameLayoutDetector.hxx in Headers */,
DC8078DB0B4BD5F3005E9305 /* DebuggerExpressions.hxx in Headers */, DC8078DB0B4BD5F3005E9305 /* DebuggerExpressions.hxx in Headers */,
DC8078EB0B4BD697005E9305 /* UIDialog.hxx in Headers */, DC8078EB0B4BD697005E9305 /* UIDialog.hxx in Headers */,
DCEECE570B5E5E540021D754 /* Cart0840.hxx in Headers */, DCEECE570B5E5E540021D754 /* Cart0840.hxx in Headers */,
@ -2324,6 +2338,7 @@
DCAACB13188D636F00A4D282 /* CartBFWidget.hxx in Headers */, DCAACB13188D636F00A4D282 /* CartBFWidget.hxx in Headers */,
DCAACB15188D636F00A4D282 /* CartDFSCWidget.hxx in Headers */, DCAACB15188D636F00A4D282 /* CartDFSCWidget.hxx in Headers */,
DC44019F1F1A5D01008C08F6 /* ColorWidget.hxx in Headers */, DC44019F1F1A5D01008C08F6 /* ColorWidget.hxx in Headers */,
E0306E0E1F93E916003DDD52 /* YStartDetector.hxx in Headers */,
DC96162D1F817830008A2206 /* AmigaMouseWidget.hxx in Headers */, DC96162D1F817830008A2206 /* AmigaMouseWidget.hxx in Headers */,
DCAACB17188D636F00A4D282 /* CartDFWidget.hxx in Headers */, DCAACB17188D636F00A4D282 /* CartDFWidget.hxx in Headers */,
DCF3A6FF1DFC75E3008A8AF3 /* TIA.hxx in Headers */, DCF3A6FF1DFC75E3008A8AF3 /* TIA.hxx in Headers */,
@ -2435,8 +2450,6 @@
E0406FB71F81A85400A82AE0 /* AbstractFrameManager.hxx in Sources */, E0406FB71F81A85400A82AE0 /* AbstractFrameManager.hxx in Sources */,
E0406FB81F81A85400A82AE0 /* FrameManager.cxx in Sources */, E0406FB81F81A85400A82AE0 /* FrameManager.cxx in Sources */,
E0406FB91F81A85400A82AE0 /* FrameManager.hxx in Sources */, E0406FB91F81A85400A82AE0 /* FrameManager.hxx in Sources */,
E0406FBA1F81A85400A82AE0 /* VblankManager.cxx in Sources */,
E0406FBB1F81A85400A82AE0 /* VblankManager.hxx in Sources */,
2D91747409BA90380026E9FF /* SDLMain.m in Sources */, 2D91747409BA90380026E9FF /* SDLMain.m in Sources */,
2D91747509BA90380026E9FF /* Booster.cxx in Sources */, 2D91747509BA90380026E9FF /* Booster.cxx in Sources */,
DC3EE8671E2C0E6D00905161 /* inftrees.c in Sources */, DC3EE8671E2C0E6D00905161 /* inftrees.c in Sources */,
@ -2462,6 +2475,7 @@
2D91748909BA90380026E9FF /* Console.cxx in Sources */, 2D91748909BA90380026E9FF /* Console.cxx in Sources */,
2D91748A09BA90380026E9FF /* Control.cxx in Sources */, 2D91748A09BA90380026E9FF /* Control.cxx in Sources */,
2D91748C09BA90380026E9FF /* Driving.cxx in Sources */, 2D91748C09BA90380026E9FF /* Driving.cxx in Sources */,
E0306E101F93E916003DDD52 /* FrameLayoutDetector.cxx in Sources */,
2D91748E09BA90380026E9FF /* Joystick.cxx in Sources */, 2D91748E09BA90380026E9FF /* Joystick.cxx in Sources */,
2D91748F09BA90380026E9FF /* Keyboard.cxx in Sources */, 2D91748F09BA90380026E9FF /* Keyboard.cxx in Sources */,
2D91749009BA90380026E9FF /* M6532.cxx in Sources */, 2D91749009BA90380026E9FF /* M6532.cxx in Sources */,
@ -2615,6 +2629,7 @@
DCD6FC7A11C281ED005DA767 /* pngrtran.c in Sources */, DCD6FC7A11C281ED005DA767 /* pngrtran.c in Sources */,
DC3EE85C1E2C0E6D00905161 /* gzclose.c in Sources */, DC3EE85C1E2C0E6D00905161 /* gzclose.c in Sources */,
DCD6FC7B11C281ED005DA767 /* pngrutil.c in Sources */, DCD6FC7B11C281ED005DA767 /* pngrutil.c in Sources */,
E0306E0F1F93E916003DDD52 /* JitterEmulation.cxx in Sources */,
DCD6FC7C11C281ED005DA767 /* pngset.c in Sources */, DCD6FC7C11C281ED005DA767 /* pngset.c in Sources */,
DCD6FC7E11C281ED005DA767 /* pngtrans.c in Sources */, DCD6FC7E11C281ED005DA767 /* pngtrans.c in Sources */,
DCD6FC7F11C281ED005DA767 /* pngwio.c in Sources */, DCD6FC7F11C281ED005DA767 /* pngwio.c in Sources */,
@ -2645,6 +2660,7 @@
DCF3A6F31DFC75E3008A8AF3 /* LatchedInput.cxx in Sources */, DCF3A6F31DFC75E3008A8AF3 /* LatchedInput.cxx in Sources */,
DC67270B1556F4860023653B /* CartCTY.cxx in Sources */, DC67270B1556F4860023653B /* CartCTY.cxx in Sources */,
DCE395F016CB0B5F008DB1E5 /* FSNodeZIP.cxx in Sources */, DCE395F016CB0B5F008DB1E5 /* FSNodeZIP.cxx in Sources */,
E0306E0C1F93E916003DDD52 /* YStartDetector.cxx in Sources */,
DCE395F216CB0B5F008DB1E5 /* ZipHandler.cxx in Sources */, DCE395F216CB0B5F008DB1E5 /* ZipHandler.cxx in Sources */,
DCAAE5D31715887B0080BB82 /* Cart2KWidget.cxx in Sources */, DCAAE5D31715887B0080BB82 /* Cart2KWidget.cxx in Sources */,
DCAAE5D51715887B0080BB82 /* Cart3FWidget.cxx in Sources */, DCAAE5D51715887B0080BB82 /* Cart3FWidget.cxx in Sources */,
@ -2755,6 +2771,7 @@
../emucore, ../emucore,
../gui, ../gui,
../yacc, ../yacc,
../emucore/tia,
., .,
); );
INFOPLIST_FILE = "Info-Stella.plist"; INFOPLIST_FILE = "Info-Stella.plist";
@ -2807,6 +2824,7 @@
../emucore, ../emucore,
../gui, ../gui,
../yacc, ../yacc,
../emucore/tia,
., .,
); );
INFOPLIST_FILE = "Info-Stella.plist"; INFOPLIST_FILE = "Info-Stella.plist";