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

adapting xcode build templates and config file to built-in zlib sources, see #16192

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-04-21 18:31:48 +00:00
parent 7ab7ff693b
commit 52b633eeea
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/osx/wx.xcconfig
View File

@@ -11,7 +11,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
GCC_PRECOMPILE_PREFIX_HEADER = YES 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/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__ 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_PFE_FILE_C_DIALECTS = c++ objective-c++ GCC_PFE_FILE_C_DIALECTS = c++ objective-c++

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

@@ -187,10 +187,7 @@
buildSettings = { buildSettings = {
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
"$(OTHER_LDFLAGS)",
"-lz",
);
}; };
name = Debug; name = Debug;
}; };
@@ -200,10 +197,7 @@
buildSettings = { buildSettings = {
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = lib;
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
"$(OTHER_LDFLAGS)",
"-lz",
);
}; };
name = Release; name = Release;
}; };

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

@@ -191,10 +191,7 @@
WXUSINGDLL, WXUSINGDLL,
); );
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
"$(OTHER_LDFLAGS)",
"-lz",
);
}; };
name = Debug; name = Debug;
}; };
@@ -208,10 +205,7 @@
WXUSINGDLL, WXUSINGDLL,
); );
INSTALL_PATH = "@executable_path/../Frameworks/"; INSTALL_PATH = "@executable_path/../Frameworks/";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
"$(OTHER_LDFLAGS)",
"-lz",
);
}; };
name = Release; name = Release;
}; };