X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52abdc8300b4822162a95b994ccb83a29600612a..7e04a500df36a6476dc27c2a7a8d9abd4bdff6fd:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index a01a5265b4..47e3606816 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -130,7 +130,7 @@ $(mk.evalExpr(wxwin.mkLibName('adv'))) - $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('media'))) $(mk.evalExpr(wxwin.mkLibName('html'))) @@ -161,6 +161,10 @@ _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -259,6 +263,9 @@ _UNICODE + + wxUSE_UNICODE_MSLU=1 + @@ -269,6 +276,13 @@ unicows + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + + @@ -329,33 +349,78 @@ - - - wx/msw/wince/setup.h - wince\setup.h - wince_setup_h - - - wx/msw/setup.h - setup.h - setup_h - + - - include\wx\msw\$(vc_setup_h) - - Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\$(vc_setup_h) +InputPath=..\include\wx\%s "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + + + $(addPrefixToList('wx/', value)) + + + $(nativePaths(addPrefixToList('include/wx/', value))) + + + + + + + + + msw/wince/setup.h + + + $(msvc_copy_setup_h_script % 'msw\wince\setup.h') + + + + + msw/setup.h + univ/setup.h + + + + $(msvc_copy_setup_h_script % 'msw\setup.h') + + + + + $(msvc_copy_setup_h_script % 'univ\setup.h') + + + + + + + + + + msw/genrcdefs.h + + + + $(_COMPILER) + cl + + +Creating $(SETUPHDIR)\wx\msw\rcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" @@ -389,6 +454,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h $(EXTRALIBS_GUI) + + $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10 + + dos4gw + + + + + + + $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) + + + + @@ -562,6 +653,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h