Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparing for multi-lib builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-08-10 17:15:09 +00:00
parent ffcfcb526f
commit 166bda1505
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/osx/wx.xcconfig
View File

@@ -13,6 +13,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES
HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"
USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib" USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
ALWAYS_SEARCH_USER_PATHS = NO ALWAYS_SEARCH_USER_PATHS = NO
GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) WXBUILDING $(WXPLATFORM) __WX__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS) WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1
GCC_PFE_FILE_C_DIALECTS = c++ objective-c++ GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
GCC_C_LANGUAGE_STANDARD = gnu99 GCC_C_LANGUAGE_STANDARD = gnu99

18
build/osx/wxcarbon_in.xcodeproj/project.pbxproj
View File

@@ -186,6 +186,11 @@
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = { buildSettings = {
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXMAKINGDLL,
"wxUSE_BASE=1",
);
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
}; };
@@ -196,6 +201,11 @@
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = { buildSettings = {
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
WXMAKINGDLL,
"wxUSE_BASE=1",
);
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
}; };
@@ -221,6 +231,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static"; PRODUCT_NAME = "$(PRODUCT_NAME)_static";
}; };
name = Debug; name = Debug;
@@ -229,6 +243,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */; baseConfigurationReference = 40E3507E10EF2C130029DC34 /* wxcarbon.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static"; PRODUCT_NAME = "$(PRODUCT_NAME)_static";
}; };
name = Release; name = Release;

14
build/osx/wxcocoa_in.xcodeproj/project.pbxproj
View File

@@ -188,7 +188,8 @@
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)", "$(GCC_PREPROCESSOR_DEFINITIONS)",
WXUSINGDLL, WXMAKINGDLL,
"wxUSE_BASE=1",
); );
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
@@ -202,7 +203,8 @@
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)", "$(GCC_PREPROCESSOR_DEFINITIONS)",
WXUSINGDLL, WXMAKINGDLL,
"wxUSE_BASE=1",
); );
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = "$(OTHER_LDFLAGS)"; OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
@@ -229,6 +231,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static"; PRODUCT_NAME = "$(PRODUCT_NAME)_static";
}; };
name = Debug; name = Debug;
@@ -237,6 +243,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */; baseConfigurationReference = 404BEEC910EC872F0080E2B8 /* wxcocoa.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
PRODUCT_NAME = "$(PRODUCT_NAME)_static"; PRODUCT_NAME = "$(PRODUCT_NAME)_static";
}; };
name = Release; name = Release;

8
build/osx/wxiphone_in.xcodeproj/project.pbxproj
View File

@@ -145,6 +145,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */; baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
}; };
name = Debug; name = Debug;
}; };
@@ -152,6 +156,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */; baseConfigurationReference = 404BECEE10EBF6330080E2B8 /* wxiphone.xcconfig */;
buildSettings = { buildSettings = {
GCC_PREPROCESSOR_DEFINITIONS = (
"$(GCC_PREPROCESSOR_DEFINITIONS)",
"wxUSE_BASE=1",
);
}; };
name = Release; name = Release;
}; };