Skip to content

V
vlc-2-2
Commit 6330b733 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: modernise framework compilation flags

parent 23f4a2ae
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 3 deletions
projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj
View file @ 6330b733
...@@ -553,6 +553,7 @@ ...@@ -553,6 +553,7 @@
1DEB91AE08733DA50010E9CD /* Debug */ = { 1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = "$(NATIVE_ARCH)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
...@@ -560,10 +561,11 @@ ...@@ -560,10 +561,11 @@
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = VLC_Prefix.pch; GCC_PREFIX_HEADER = VLC_Prefix.pch;
GCC_VERSION = com.apple.compilers.llvmgcc42;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(VLC_SRC_DIR)/include", "$(VLC_SRC_DIR)/include",
"Headers/**", "Headers/**",
...@@ -574,6 +576,7 @@ ...@@ -574,6 +576,7 @@
LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib"; LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib"; LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib"; LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-single_module", "-single_module",
"-read_only_relocs", "-read_only_relocs",
...@@ -583,6 +586,7 @@ ...@@ -583,6 +586,7 @@
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit; PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir"; VLC_BUILD_DIR = "$(SYMROOT)/vlc_build_dir";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"; VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
VLC_SRC_DIR = ../../..; VLC_SRC_DIR = ../../..;
...@@ -594,15 +598,16 @@ ...@@ -594,15 +598,16 @@
1DEB91AF08733DA50010E9CD /* Release */ = { 1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ARCHS = i386; ARCHS = "$(NATIVE_ARCH)";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A; FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = VLC_Prefix.pch; GCC_PREFIX_HEADER = VLC_Prefix.pch;
GCC_VERSION = com.apple.compilers.llvmgcc42;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(VLC_SRC_DIR)/include", "$(VLC_SRC_DIR)/include",
"Headers/**", "Headers/**",
...@@ -613,6 +618,7 @@ ...@@ -613,6 +618,7 @@
LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib"; LD_FLAGS_LIBVLC = "-dylib_file @loader_path/lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib -dylib_file @loader_path/../lib/libvlc.dylib:$(VLC_FRAMEWORK)/lib/libvlc.dylib";
LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib"; LD_FLAGS_LIBVLC_CONTROL = "-dylib_file @loader_path/lib/libvlc-control.dylib:$(VLC_FRAMEWORK)/lib/libvlc-control.dylib";
LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib"; LIBRARY_SEARCH_PATHS = "$(VLC_FRAMEWORK)/lib";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-single_module", "-single_module",
"-read_only_relocs", "-read_only_relocs",
...@@ -625,6 +631,7 @@ ...@@ -625,6 +631,7 @@
PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
PRODUCT_NAME = VLCKit; PRODUCT_NAME = VLCKit;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
VLC_BUILD_DIR = "$(VLC_SRC_DIR)"; VLC_BUILD_DIR = "$(VLC_SRC_DIR)";
VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework"; VLC_FRAMEWORK = "$(TARGET_BUILD_DIR)/$(PROJECT_NAME).framework";
VLC_SRC_DIR = ../../..; VLC_SRC_DIR = ../../..;
...@@ -721,9 +728,13 @@ ...@@ -721,9 +728,13 @@
63FFDBD00D2AE2AE0092FC96 /* Debug */ = { 63FFDBD00D2AE2AE0092FC96 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CC = "/Developer/usr/bin/llvm-gcc-4.2";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CXX = "/Developer/usr/bin/llvm-g++-4.2";
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = 4.2;
OBJC = "/Developer/usr/bin/llvm-gcc-4.2";
PRODUCT_NAME = "vlc-bootstrap"; PRODUCT_NAME = "vlc-bootstrap";
}; };
name = Debug; name = Debug;
...@@ -731,9 +742,13 @@ ...@@ -731,9 +742,13 @@
63FFDBD10D2AE2AE0092FC96 /* Release */ = { 63FFDBD10D2AE2AE0092FC96 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CC = "/Developer/usr/bin/llvm-gcc-4.2";
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CXX = "/Developer/usr/bin/llvm-g++-4.2";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_VERSION = 4.2;
OBJC = "/Developer/usr/bin/llvm-gcc-4.2";
PRODUCT_NAME = "vlc-bootstrap"; PRODUCT_NAME = "vlc-bootstrap";
ZERO_LINK = NO; ZERO_LINK = NO;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment