vlc | branch: master | Marvin Scholz <[email protected]> | Tue May 9 10:10:47 2017 +0200| [9d6abbcb4db3e5f376815d0dda79285219804f32] | committer: Marvin Scholz
macOS: Assume in Xcode project that build exists This is a vague assumption as the build folder could be called anything actually or not be present at all, but for most users following the wiki guide this will be true. If it isn't, it will result in missing header errors, the same that were present before this change. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d6abbcb4db3e5f376815d0dda79285219804f32 --- .../package/macosx/VLC.xcodeproj/project.pbxproj | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj index c90b11d2e5..3a5021bb32 100644 --- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj +++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj @@ -1918,6 +1918,13 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + HEADER_SEARCH_PATHS = ( + ../../../include/, + ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, + ../../../build/, + ); LD_RUNPATH_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; @@ -1935,6 +1942,13 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + HEADER_SEARCH_PATHS = ( + ../../../include/, + ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, + ../../../build/, + ); LD_RUNPATH_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1951,6 +1965,13 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + HEADER_SEARCH_PATHS = ( + ../../../include/, + ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, + ../../../build/, + ); LD_RUNPATH_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1975,6 +1996,7 @@ ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1984,6 +2006,8 @@ HEADER_SEARCH_PATHS = ( ../../../include/, ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, ); MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; @@ -2011,6 +2035,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -2020,6 +2045,8 @@ HEADER_SEARCH_PATHS = ( ../../../include/, ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, ); MACOSX_DEPLOYMENT_TARGET = 10.7; PATH = $VLC_PATH; @@ -2046,6 +2073,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "HAVE_CONFIG_H=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -2055,6 +2083,8 @@ HEADER_SEARCH_PATHS = ( ../../../include/, ../../../include/vlc/, + ../../../build/include/vlc/, + ../../../build/include/, ); MACOSX_DEPLOYMENT_TARGET = 10.7; PATH = $VLC_PATH; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
