From 3b1551a714e4c4a275ecbc5b1db2bb51d4965b42 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 27 Sep 2018 14:46:33 +0200 Subject: [PATCH] Fixing builds with Xcode --- build/osx/wxcocoa.xcodeproj/project.pbxproj | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj index 6d9a13cb11..b713560798 100644 --- a/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -823,8 +823,12 @@ 4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; 4040AE89BF9F34668091064C /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; }; - 215958201947310B88BBEDB3 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; }; 750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; }; + 750C716389AD3ADBABC9D68A /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; }; + 750C716389AD3ADBABC9D68B /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; }; + 215958201947310B88BBEDB3 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; }; + 215958201947310B88BBEDB4 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; }; + 215958201947310B88BBEDB5 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; }; 4156FDB73D0A397A870E4302 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; 4156FDB73D0A397A870E4303 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; 4156FDB73D0A397A870E4304 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; }; @@ -4090,8 +4094,6 @@ 4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = ""; }; 40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = ""; }; 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = ""; }; - FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = statbmp.mm; path = ../../src/osx/cocoa/statbmp.mm; sourceTree = ""; }; - F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statbmp_osx.cpp; path = ../../src/osx/statbmp_osx.cpp; sourceTree = ""; }; 40CE02524DD4385AB2C3DF95 /* socket.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = socket.cpp; path = ../../src/common/socket.cpp; sourceTree = ""; }; 4188821BBA833CCAA678B234 /* utilscmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = utilscmn.cpp; path = ../../src/common/utilscmn.cpp; sourceTree = ""; }; 418AD9241B673308BE31DC06 /* xlocale.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xlocale.cpp; path = ../../src/common/xlocale.cpp; sourceTree = ""; }; @@ -4758,6 +4760,7 @@ F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = ""; }; F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/lexers/LexMetapost.cxx; sourceTree = ""; }; F52DCBC0442233738B39138E /* CaseFolder.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../src/stc/scintilla/src/CaseFolder.cxx; sourceTree = ""; }; + F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statbmp_osx.cpp; path = ../../src/osx/statbmp_osx.cpp; sourceTree = ""; }; F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = ""; }; F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = ""; }; F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jbig.c; path = ../../src/tiff/libtiff/tif_jbig.c; sourceTree = ""; }; @@ -4783,6 +4786,7 @@ FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/stc/scintilla/lexers/LexTeX.cxx; sourceTree = ""; }; FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_srchctrl.cpp; path = ../../src/xrc/xh_srchctrl.cpp; sourceTree = ""; }; FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = ""; }; + FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = statbmp.mm; path = ../../src/osx/cocoa/statbmp.mm; sourceTree = ""; }; FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = ""; }; FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = ""; }; FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = ""; }; @@ -7543,6 +7547,7 @@ 0FFFFA2F762B3160955D1D8A /* gauge_osx.cpp in Sources */, E4B826CE70283D999CB591F5 /* listbox_osx.cpp in Sources */, B198DA8239E9358A9D56B98A /* menu_osx.cpp in Sources */, + 750C716389AD3ADBABC9D68B /* statbmp_osx.cpp in Sources */, 1DF3A4F85FCB3BA79A552F3F /* menuitem_osx.cpp in Sources */, A3321FE2A87D3BD69E0BB00B /* notebook_osx.cpp in Sources */, 0C9A379D97B133FA831175A9 /* printdlg_osx.cpp in Sources */, @@ -7560,6 +7565,7 @@ 664A54F914443110B7BB692A /* tglbtn_osx.cpp in Sources */, A569A33A2097316D8110C2C3 /* toolbar_osx.cpp in Sources */, 0AEBA7389E223781A7A257A3 /* webkit.mm in Sources */, + 215958201947310B88BBEDB5 /* statbmp.mm in Sources */, F5FF98C231B33E3EB7902C66 /* colordlgosx.mm in Sources */, 2386B575BC3931D2AF86CB35 /* fontdlgosx.mm in Sources */, 2EECB3C2F9523D0B95847A81 /* accel.cpp in Sources */, @@ -8125,6 +8131,7 @@ E882402BEE0330A080A65170 /* strconv.cpp in Sources */, 30493B486DFF35AF80D12C4A /* stream.cpp in Sources */, 795613831EC8332A83FF26E8 /* string.cpp in Sources */, + 750C716389AD3ADBABC9D68A /* statbmp_osx.cpp in Sources */, 55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */, 88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */, 056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */, @@ -8583,6 +8590,7 @@ 5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */, CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */, 26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */, + 215958201947310B88BBEDB4 /* statbmp.mm in Sources */, E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */, 1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */, E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */, @@ -9348,6 +9356,7 @@ E882402BEE0330A080A6516F /* strconv.cpp in Sources */, 30493B486DFF35AF80D12C49 /* stream.cpp in Sources */, 795613831EC8332A83FF26E7 /* string.cpp in Sources */, + 750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */, 55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */, 88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */, 056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */, @@ -9806,6 +9815,7 @@ 5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */, CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */, 26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */, + 215958201947310B88BBEDB3 /* statbmp.mm in Sources */, E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */, 1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */, E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */,