X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00100882f5b38ff30ee3a030f6af940866a31cb9..49e6c3d6cc11899086cc4abf4241a09da454890b:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index ab78d55f42..96fbcdf3fa 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -22,10 +22,6 @@
0
-
- 0
-
-
@@ -34,6 +30,15 @@
+
+ _$(CPU)
+ _x64
+ _x64
+ _ia64
+ _ia64
+ _x64
+ _x64
+
@@ -48,12 +53,26 @@
_carbon
+
+
+ ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+
+
$(COMPILER)
gcc
+
+
- _$(COMPILERORGCC)
+ _$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)
+ _$(COMPILERORGCC)
@@ -161,7 +180,9 @@
$(mk.evalExpr(wxwin.mkLibName('stc')))
-
+
+ $(mk.evalExpr(wxwin.mkLibName('webview')))
+
$(mk.evalExpr(wxwin.mkLibName('mono')))
@@ -171,14 +192,6 @@
-
- _$(CPU)
- _amd64
- _amd64
- _ia64
- _ia64
-
-
dll
@@ -187,12 +200,12 @@
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
-
$(COMPILER)
- $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
$(OBJS)
@@ -208,7 +221,7 @@
$(wx_top_builddir)/lib
- $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+ $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
@@ -266,6 +279,11 @@
wxDEBUG_LEVEL=0
+
+ NDEBUG
+ NDEBUG
+
+
__NO_VC_CRTDBG__
@@ -287,21 +305,23 @@
unicows
-
-
-
- gdiplus
-
-
- wxUSE_GRAPHICS_CONTEXT=1
-
-
+
+ cairo
+
+
+ $(DOLLAR)(CAIRO_ROOT)/lib
+
+
+ $(DOLLAR)(CAIRO_ROOT)/include/cairo
+
- /MACHINE:AMD64
- /MACHINE:AMD64
+ /MACHINE:X64
+ /MACHINE:X64
/MACHINE:IA64
/MACHINE:IA64
+ /MACHINE:X64
+ /MACHINE:X64
@@ -315,6 +335,13 @@
$(EXTRACFLAGS)
+
+
+ _CRT_SECURE_NO_DEPRECATE=1
+ _CRT_NON_CONFORMING_SWPRINTFS=1
+ _SCL_SECURE_NO_WARNINGS=1
+
+
$(NO_VC_CRTDBG)
$(WIN32_WINNT)
@@ -347,6 +374,16 @@
neither we nor wx users are interested in debugging them anyhow
-->
NDEBUG
+
+
+
+ _CRT_SECURE_NO_WARNINGS
+
@@ -361,7 +398,14 @@
-
+
+Creating $(SETUPHDIR)\wx\setup.h
+InputPath=..\..\include\wx\%s
+
+"$(SETUPHDIR)\wx\setup.h" :
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+
+
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
@@ -397,10 +441,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
univ/setup.h
-
+
$(msvc_copy_setup_h_script % 'msw\setup.h')
+
+
+ $(msvc_copy_setup_h_script % 'gtk\setup.h')
+
+
$(msvc_copy_setup_h_script % 'univ\setup.h')
@@ -458,7 +507,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
The variables below are defined so that all libs are used
in monolithic build, but not in multilib one. -->
- $(EXTRALIBS) $(EXTRALIBS_GUI)
+ $(EXTRALIBS) $(EXTRALIBS_XML) $(EXTRALIBS_GUI)
$(EXTRALIBS)
@@ -466,31 +515,26 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(EXTRALIBS_GUI)
-
- $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10
-
- dos4gw
-
-
+
+
+ -mms-bitfields
+
$(wxwin.mk_wxid(id))
__WX$(TOOLKIT)__
$(WXUNIV_DEFINE)
$(DEBUG_DEFINE)
+ $(NDEBUG_DEFINE)
$(EXCEPTIONS_DEFINE)
$(RTTI_DEFINE)
$(THREAD_DEFINE)
$(UNICODE_DEFINE)
$(MSLU_DEFINE)
- $(GFXCTX_DEFINE)
$(SETUPHDIR)
$(TOP_SRCDIR)include
+ $(CAIRO_INCLUDEDIR)
$(LIBDIRNAME)
-
- $(MGLLIBPATH)
- $(MGLLIBPATH)/$(MGLPMLIBPATH)
-
max
$(CXXWARNINGS)
@@ -502,6 +546,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
-Wno-ctor-dtor-privacy
+ $(CXXFLAGS_GTK_WINDOWS_GCC)
@@ -521,17 +566,11 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
-
-
- mgl
- mglcpp
- pm
-
-
$(UNICOWS_LIB)
- $(GDIPLUS_LIB)
+ $(CAIRO_LIB)
+ $(CAIRO_LIBDIR)
ole2w32
@@ -568,23 +607,38 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
+
+ gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib
+
$(LIB_TIFF)
$(LIB_JPEG)
$(LIB_PNG)
+ $(LIB_GTK)
$(EXTRALIBS_FOR_GUI)
+
+ $(LIB_PNG)
+
+
+
+ $(LIB_SCINTILLA)
+
-
+
$(WXLIB_MONO)
+ $(LIB_PNG_IF_MONO)
$(WXLIB_MONO)
+ $(LIB_SCINTILLA_IF_MONO)
@@ -597,7 +651,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
WXBUILDING
-
+
$(WXTOPDIR)src/common/dummy.cpp
$(WXTOPDIR)src/common/dummy.cpp
@@ -609,16 +663,20 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
wxprec_$(id)
src/common/extended.c
+ src/gtk/eggtrayicon.c
+ src/gtk/treeentry_gtk.c
Common Sources:src/common/*
+ GTK+ Sources:src/gtk/*
MSW Sources:src/msw/*
Generic Sources:src/generic/*
wxUniv Sources:src/univ/*
wxHTML Sources:src/html/*
Setup Headers:*/setup.h
+ GTK+ Headers:*wx/gtk/*.h
MSW Headers:*wx/msw/*.h
Generic Headers:*wx/generic/*.h
wxUniv Headers:*wx/univ/*.h
@@ -652,7 +710,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
$(DYLIB_RPATH_POSTLINK)
$(WXTOPDIR)src/msw/version.rc
-
+
@@ -670,9 +728,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
-
- $(DOLLAR)(%SCITECH)/include
-
$(INC_TIFF_BUILD)
$(INC_TIFF)
$(INC_JPEG)