From 18ca1e261c45056b4270330c7c86bb0bf36b34eb Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 18 Jun 2017 20:40:05 +0100 Subject: [PATCH] macOS: Updated Xcode project --- projects/osx/Info_cocoa.plist | 2 +- .../project.pbxproj | 170 ++++++++++-------- projects/osx/configure-values.txt | 3 + 3 files changed, 102 insertions(+), 73 deletions(-) create mode 100644 projects/osx/configure-values.txt diff --git a/projects/osx/Info_cocoa.plist b/projects/osx/Info_cocoa.plist index af16971..a867900 100644 --- a/projects/osx/Info_cocoa.plist +++ b/projects/osx/Info_cocoa.plist @@ -34,7 +34,7 @@ LSApplicationCategoryType public.app-category.productivity NSHumanReadableCopyright - Copyright 2013-2016 Xestia Software Development + Copyright 2013-2017 Xestia Software Development NSPrincipalClass wxNSApplication diff --git a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj index 9eb104b..aabac0f 100644 --- a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj +++ b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj @@ -64,28 +64,12 @@ 4A6DA3D61CAC0A9F00A15B3D /* vcard34conv-v4conv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3D41CAC0A9F00A15B3D /* vcard34conv-v4conv.cpp */; }; 4A6DA3D91CAC0AAC00A15B3D /* XABContactMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3D71CAC0AAC00A15B3D /* XABContactMenu.cpp */; }; 4A6DA3EB1CAC0B8C00A15B3D /* bitmapcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3EA1CAC0B8C00A15B3D /* bitmapcode.cpp */; }; - 4A6DA3EC1CAC0B9F00A15B3D /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; }; - 4A6DA3EF1CAC0FCB00A15B3D /* libwx_osx_cocoa.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 4A6DA3F11CB044EA00A15B3D /* frmNewAccount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3F01CB044EA00A15B3D /* frmNewAccount.mm */; }; 4A6DA3FE1CB19BDF00A15B3D /* frmActivityMgr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3FD1CB19BDF00A15B3D /* frmActivityMgr.mm */; }; 4A6DA4001CB1CE0400A15B3D /* frmMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA3FF1CB1CE0400A15B3D /* frmMain.mm */; }; 4A6DA4021CBD8D9300A15B3D /* frmEditAccount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A6DA4011CBD8D9200A15B3D /* frmEditAccount.mm */; }; 4A73D5781E74A06E001AB708 /* languages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A73D5761E74A06E001AB708 /* languages.cpp */; }; 4A73D5791E74A440001AB708 /* languages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A73D5761E74A06E001AB708 /* languages.cpp */; }; - 4A8259191CF4EA3800E57862 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; }; - 4A82591D1CF4EA4600E57862 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; }; - 4A82591E1CF4EA4600E57862 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; }; - 4A82591F1CF4EA4600E57862 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; }; - 4A8259211CF4EA9700E57862 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259201CF4EA9700E57862 /* libxml2.dylib */; }; - 4A8259221CF4EC5500E57862 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; }; - 4A8259231CF4EC5500E57862 /* sfml-audio.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259241CF4EC5D00E57862 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; }; - 4A8259251CF4EC5D00E57862 /* sfml-system.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591B1CF4EA4600E57862 /* sfml-system.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259261CF4EC5D00E57862 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; }; - 4A8259271CF4EC5D00E57862 /* SFML.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A82591C1CF4EA4600E57862 /* SFML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A8259281CF4EC5D00E57862 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; }; - 4A8259291CF4EC5D00E57862 /* libcurl.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A8259181CF4EA3800E57862 /* libcurl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 4A82592A1CF4EC6A00E57862 /* libxml2.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4A8259201CF4EA9700E57862 /* libxml2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 4A83E33E1B236DD7003294C2 /* AppXestiaAddrBk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3211B236DD7003294C2 /* AppXestiaAddrBk.cpp */; }; 4A83E33F1B236DD7003294C2 /* frmAbout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3261B236DD7003294C2 /* frmAbout.cpp */; }; 4A83E3411B236DD7003294C2 /* frmConflictResolution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E32A1B236DD7003294C2 /* frmConflictResolution.cpp */; }; @@ -128,10 +112,29 @@ 4ABACC9D1B20E968001368B0 /* wxdebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC981B20E968001368B0 /* wxdebug.xcconfig */; }; 4ABACC9E1B20E968001368B0 /* wxrelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC991B20E968001368B0 /* wxrelease.xcconfig */; }; 4ABACC9F1B20E968001368B0 /* Info_cocoa.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4ABACC9A1B20E968001368B0 /* Info_cocoa.plist */; }; - 4ABACCAE1B20F6B2001368B0 /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; }; 4ADDA7F51B222936007AD131 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ADDA7F41B222936007AD131 /* main.cpp */; }; - 4ADDA7FE1B235FDB007AD131 /* libwx_osx_cocoa.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 4AE7527A1B24F8B90058ECBE /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4AE752791B24F8B90058ECBE /* Images.xcassets */; }; + 4BF08A2F1EF6D838004CDF65 /* SFML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A291EF6D647004CDF65 /* SFML.framework */; }; + 4BF08A301EF6D83A004CDF65 /* sfml-system.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A281EF6D647004CDF65 /* sfml-system.framework */; }; + 4BF08A311EF6D83D004CDF65 /* sfml-audio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */; }; + 4BF08A3D1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; }; + 4BF08A3E1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; }; + 4BF08A401EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; }; + 4BF08A411EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; }; + 4BF08A421EF6FB46004CDF65 /* libxml2.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A431EF6FB54004CDF65 /* sfml-audio.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A441EF6FB56004CDF65 /* sfml-system.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A281EF6D647004CDF65 /* sfml-system.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A451EF6FB57004CDF65 /* SFML.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A291EF6D647004CDF65 /* SFML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A461EF6FB5D004CDF65 /* libxml2.2.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A471EF6FB64004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 4BF08A4F1EF706C7004CDF65 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */; }; + 4BF08A501EF706DE004CDF65 /* libcurl.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A571EF70AB3004CDF65 /* FLAC.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A511EF70AB3004CDF65 /* FLAC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A581EF70AB3004CDF65 /* ogg.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A521EF70AB3004CDF65 /* ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A591EF70AB3004CDF65 /* OpenAL.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5A1EF70AB3004CDF65 /* vorbis.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A541EF70AB3004CDF65 /* vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5B1EF70AB3004CDF65 /* vorbisenc.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4BF08A5C1EF70AB3004CDF65 /* vorbisfile.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -151,7 +154,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4A6DA3EF1CAC0FCB00A15B3D /* libwx_osx_cocoa.dylib in CopyFiles */, + 4BF08A421EF6FB46004CDF65 /* libxml2.2.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -161,12 +164,18 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 4A8259271CF4EC5D00E57862 /* SFML.framework in Copy Files */, - 4A8259291CF4EC5D00E57862 /* libcurl.framework in Copy Files */, - 4A8259251CF4EC5D00E57862 /* sfml-system.framework in Copy Files */, - 4ADDA7FE1B235FDB007AD131 /* libwx_osx_cocoa.dylib in Copy Files */, - 4A82592A1CF4EC6A00E57862 /* libxml2.dylib in Copy Files */, - 4A8259231CF4EC5500E57862 /* sfml-audio.framework in Copy Files */, + 4BF08A501EF706DE004CDF65 /* libcurl.framework in Copy Files */, + 4BF08A571EF70AB3004CDF65 /* FLAC.framework in Copy Files */, + 4BF08A581EF70AB3004CDF65 /* ogg.framework in Copy Files */, + 4BF08A591EF70AB3004CDF65 /* OpenAL.framework in Copy Files */, + 4BF08A5A1EF70AB3004CDF65 /* vorbis.framework in Copy Files */, + 4BF08A5B1EF70AB3004CDF65 /* vorbisenc.framework in Copy Files */, + 4BF08A5C1EF70AB3004CDF65 /* vorbisfile.framework in Copy Files */, + 4BF08A431EF6FB54004CDF65 /* sfml-audio.framework in Copy Files */, + 4BF08A471EF6FB64004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Copy Files */, + 4BF08A461EF6FB5D004CDF65 /* libxml2.2.dylib in Copy Files */, + 4BF08A451EF6FB57004CDF65 /* SFML.framework in Copy Files */, + 4BF08A441EF6FB56004CDF65 /* sfml-system.framework in Copy Files */, ); name = "Copy Files"; runOnlyForDeploymentPostprocessing = 0; @@ -270,11 +279,6 @@ 4A6DA4011CBD8D9200A15B3D /* frmEditAccount.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = frmEditAccount.mm; path = ../../source/frmEditAccount.mm; sourceTree = ""; }; 4A73D5761E74A06E001AB708 /* languages.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = languages.cpp; path = ../../source/common/languages.cpp; sourceTree = ""; }; 4A73D5771E74A06E001AB708 /* languages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = languages.h; path = ../../source/common/languages.h; sourceTree = ""; }; - 4A8259181CF4EA3800E57862 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = "../../../../../Library/curl-7.49.0/libcurl.framework"; sourceTree = ""; }; - 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/sfml-audio.framework"; sourceTree = ""; }; - 4A82591B1CF4EA4600E57862 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/sfml-system.framework"; sourceTree = ""; }; - 4A82591C1CF4EA4600E57862 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = "../../../../../Library/SFML-2.3-osx-clang-universal/Frameworks/SFML.framework"; sourceTree = ""; }; - 4A8259201CF4EA9700E57862 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = "../../../../../Library/libxml2-2.9.2/.libs/libxml2.dylib"; sourceTree = ""; }; 4A83E3211B236DD7003294C2 /* AppXestiaAddrBk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppXestiaAddrBk.cpp; path = ../../source/AppXestiaAddrBk.cpp; sourceTree = ""; }; 4A83E3221B236DD7003294C2 /* AppXestiaAddrBk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppXestiaAddrBk.h; path = ../../source/AppXestiaAddrBk.h; sourceTree = ""; }; 4A83E3241B236DD7003294C2 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../source/debug.h; sourceTree = ""; }; @@ -357,9 +361,20 @@ 4ABACC991B20E968001368B0 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = wxrelease.xcconfig; sourceTree = ""; }; 4ABACC9A1B20E968001368B0 /* Info_cocoa.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_cocoa.plist; sourceTree = ""; }; 4ABACCA11B20ECA8001368B0 /* Xestia Address Book.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Xestia Address Book.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwx_osx_cocoa.dylib; path = "/Users/sbrokenshire/Library/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release/libwx_osx_cocoa.dylib"; sourceTree = ""; }; 4ADDA7F41B222936007AD131 /* main.cpp */ = {isa = PBXFileReference; indentWidth = 8; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../source/main.cpp; sourceTree = ""; tabWidth = 8; usesTabs = 1; }; 4AE752791B24F8B90058ECBE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-audio.framework"; path = "../../../../Libraries/sfml-audio.framework"; sourceTree = ""; }; + 4BF08A281EF6D647004CDF65 /* sfml-system.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "sfml-system.framework"; path = "../../../../Libraries/sfml-system.framework"; sourceTree = ""; }; + 4BF08A291EF6D647004CDF65 /* SFML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFML.framework; path = ../../../../Libraries/SFML.framework; sourceTree = ""; }; + 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau-3.0.0.3.0.dylib"; path = "../../../../Build/wxWidgets-3.0.3/lib/libwx_osx_cocoau-3.0.0.3.0.dylib"; sourceTree = ""; }; + 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.dylib; path = ../../../../Libraries/libxml2.2.dylib; sourceTree = ""; }; + 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = "../../../../Build/curl-7.53.1/libcurl.framework"; sourceTree = ""; }; + 4BF08A511EF70AB3004CDF65 /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/FLAC.framework"; sourceTree = ""; }; + 4BF08A521EF70AB3004CDF65 /* ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ogg.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/ogg.framework"; sourceTree = ""; }; + 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/OpenAL.framework"; sourceTree = ""; }; + 4BF08A541EF70AB3004CDF65 /* vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbis.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbis.framework"; sourceTree = ""; }; + 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisenc.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbisenc.framework"; sourceTree = ""; }; + 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbisfile.framework; path = "../../../../Build/SFML-2.4.2/extlibs/libs-osx/Frameworks/vorbisfile.framework"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -367,7 +382,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A6DA3EC1CAC0B9F00A15B3D /* libwx_osx_cocoa.dylib in Frameworks */, + 4BF08A3D1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */, + 4BF08A401EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -375,19 +391,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A8259261CF4EC5D00E57862 /* SFML.framework in Frameworks */, - 4A8259281CF4EC5D00E57862 /* libcurl.framework in Frameworks */, - 4A8259241CF4EC5D00E57862 /* sfml-system.framework in Frameworks */, - 4A82591D1CF4EA4600E57862 /* sfml-audio.framework in Frameworks */, - 4A8259221CF4EC5500E57862 /* sfml-audio.framework in Frameworks */, - 4A8259191CF4EA3800E57862 /* libcurl.framework in Frameworks */, - 4A8259211CF4EA9700E57862 /* libxml2.dylib in Frameworks */, + 4BF08A4F1EF706C7004CDF65 /* libcurl.framework in Frameworks */, + 4BF08A301EF6D83A004CDF65 /* sfml-system.framework in Frameworks */, + 4BF08A2F1EF6D838004CDF65 /* SFML.framework in Frameworks */, 4A96DD751B93D5D400FAD2CA /* SecurityInterface.framework in Frameworks */, + 4BF08A411EF6FB3C004CDF65 /* libxml2.2.dylib in Frameworks */, + 4BF08A3E1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib in Frameworks */, + 4BF08A311EF6D83D004CDF65 /* sfml-audio.framework in Frameworks */, 4A98DD431B7E57FC0002E872 /* Security.framework in Frameworks */, 4A98DD3B1B6ABEC80002E872 /* CoreFoundation.framework in Frameworks */, - 4A82591E1CF4EA4600E57862 /* sfml-system.framework in Frameworks */, - 4A82591F1CF4EA4600E57862 /* SFML.framework in Frameworks */, - 4ABACCAE1B20F6B2001368B0 /* libwx_osx_cocoa.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -435,15 +447,21 @@ 4A6DA3F21CB04F9400A15B3D /* Frameworks & Libraries */ = { isa = PBXGroup; children = ( - 4A82591A1CF4EA4600E57862 /* sfml-audio.framework */, - 4A82591B1CF4EA4600E57862 /* sfml-system.framework */, - 4A82591C1CF4EA4600E57862 /* SFML.framework */, - 4A8259181CF4EA3800E57862 /* libcurl.framework */, + 4BF08A511EF70AB3004CDF65 /* FLAC.framework */, + 4BF08A521EF70AB3004CDF65 /* ogg.framework */, + 4BF08A531EF70AB3004CDF65 /* OpenAL.framework */, + 4BF08A541EF70AB3004CDF65 /* vorbis.framework */, + 4BF08A551EF70AB3004CDF65 /* vorbisenc.framework */, + 4BF08A561EF70AB3004CDF65 /* vorbisfile.framework */, + 4BF08A3F1EF6FB3C004CDF65 /* libxml2.2.dylib */, + 4BF08A3C1EF6F9A0004CDF65 /* libwx_osx_cocoau-3.0.0.3.0.dylib */, + 4BF08A4E1EF706C7004CDF65 /* libcurl.framework */, + 4BF08A271EF6D647004CDF65 /* sfml-audio.framework */, + 4BF08A281EF6D647004CDF65 /* sfml-system.framework */, + 4BF08A291EF6D647004CDF65 /* SFML.framework */, 4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */, 4A98DD421B7E57FC0002E872 /* Security.framework */, 4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */, - 4ABACCAC1B20F69C001368B0 /* libwx_osx_cocoa.dylib */, - 4A8259201CF4EA9700E57862 /* libxml2.dylib */, ); name = "Frameworks & Libraries"; sourceTree = ""; @@ -922,9 +940,10 @@ 4A6DA3E71CAC0B3E00A15B3D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LIBRARY = "compiler-default"; DEPLOYMENT_LOCATION = NO; ENABLE_TESTABILITY = YES; GCC_PREFIX_HEADER = "$(WXROOT)/include/wx/wxprec.h"; @@ -949,20 +968,24 @@ "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", ); - LIBRARY_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + LIBRARY_SEARCH_PATHS = ( + "$(WXROOT)/lib", + /Users/kiri/Libraries, + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(TARGET_NAME)"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Debug; }; 4A6DA3E81CAC0B3E00A15B3D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LIBRARY = "compiler-default"; DEPLOYMENT_LOCATION = NO; GCC_PREFIX_HEADER = "$(WXROOT)/include/wx/wxprec.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -986,11 +1009,14 @@ "$(WXROOT)/build/osx/setup/cocoa/include", "$(WXROOT)/samples/minimal", ); - LIBRARY_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + LIBRARY_SEARCH_PATHS = ( + "$(WXROOT)/lib", + /Users/kiri/Libraries, + ); + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(TARGET_NAME)"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Release; }; @@ -1089,10 +1115,10 @@ CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_ENTITLEMENTS = ""; COMBINE_HIDPI_IMAGES = YES; - CURL_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/curl-7.49.0/"; + CURL_FRAMEWORKPATH = "/Users/kiri/Build/curl-7.53.1/"; FRAMEWORK_SEARCH_PATHS = ( - "$(SFML_FRAMEWORKPATH)/Frameworks", - "$(CURL_FRAMEWORKPATH)", + "$(SFML_FRAMEWORKPATH)/**", + "$(CURL_FRAMEWORKPATH)/**", "$(inherited)", "$(PROJECT_DIR)", ); @@ -1124,10 +1150,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release", - "($LIBXML2_PATH)/.libs", + "$(WXROOT)/lib", + "$(LIBXML2_PATH)/.libs", ); - LIBXML2_PATH = "/Volumes/XestiaDevel/Library/libxml2-2.9.2/"; + LIBXML2_PATH = "/Users/kiri/Build/libxml2-2.9.4"; MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1154,9 +1180,9 @@ ); PRODUCT_NAME = "Xestia Address Book"; PRODUCT_VERSION = 0.18; - SFML_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/SFML-2.3-osx-clang-universal/"; + SFML_FRAMEWORKPATH = "/Users/kiri/Build/SFML-2.4.2-build/"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Debug; }; @@ -1171,10 +1197,10 @@ CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_ENTITLEMENTS = ""; COMBINE_HIDPI_IMAGES = YES; - CURL_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/curl-7.49.0/"; + CURL_FRAMEWORKPATH = "/Users/kiri/Build/curl-7.53.1/"; FRAMEWORK_SEARCH_PATHS = ( - "$(SFML_FRAMEWORKPATH)/Frameworks", - "$(CURL_FRAMEWORKPATH)", + "$(SFML_FRAMEWORKPATH)/**", + "$(CURL_FRAMEWORKPATH)/**", "$(inherited)", "$(PROJECT_DIR)", ); @@ -1206,10 +1232,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/wxcocoa-axijybonhqhdjnfjrmomlixzmrgw/Build/Products/Release", - "($LIBXML2_PATH)/.libs", + "$(WXROOT)/lib", + "$(LIBXML2_PATH)/.libs", ); - LIBXML2_PATH = "/Volumes/XestiaDevel/Library/libxml2-2.9.2/"; + LIBXML2_PATH = "/Users/kiri/Build/libxml2-2.9.4"; MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1236,9 +1262,9 @@ ); PRODUCT_NAME = "Xestia Address Book"; PRODUCT_VERSION = 0.18; - SFML_FRAMEWORKPATH = "/Volumes/XestiaDevel/Library/SFML-2.3-osx-clang-universal/"; + SFML_FRAMEWORKPATH = "/Users/kiri/Build/SFML-2.4.2-build/"; WXPLATFORM = __WXOSX_COCOA__; - WXROOT = "/Volumes/XestiaDevel/Library/wxWidgets-3.0.2"; + WXROOT = "/Users/kiri/Build/wxWidgets-3.0.3"; }; name = Release; }; diff --git a/projects/osx/configure-values.txt b/projects/osx/configure-values.txt new file mode 100644 index 0000000..429163f --- /dev/null +++ b/projects/osx/configure-values.txt @@ -0,0 +1,3 @@ +wxWidgets: + +./configure --enable-monolithic --with-osx_cocoa --with-macosx-version-min=10.7 --with-opengl CC=clang CXX=clang++ CXXFLAGS="-stdlib=libc++ -std=c++11" OBJCXXFLAGS="-stdlib=libc++ -std=c++11" LDFLAGS=-stdlib=libc++ -- 2.39.5