X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea10101a158dd81d66cff6e66e0fb6e4e3612e5d..7c3f702506c52162aa913bdf26ba180c7107c705:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 0ab45bc3a4..c8b45a7847 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) @@ -173,14 +192,6 @@ - - _$(CPU) - _amd64 - _amd64 - _ia64 - _ia64 - - dll @@ -194,7 +205,7 @@ $(COMPILER) - $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX) $(OBJS) @@ -210,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) @@ -309,6 +320,8 @@ /MACHINE:X64 /MACHINE:IA64 /MACHINE:IA64 + /MACHINE:X64 + /MACHINE:X64 + + 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 + @@ -629,7 +657,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r WXBUILDING - + $(WXTOPDIR)src/common/dummy.cpp $(WXTOPDIR)src/common/dummy.cpp @@ -641,16 +669,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 @@ -684,7 +716,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(DYLIB_RPATH_POSTLINK) $(WXTOPDIR)src/msw/version.rc - +