X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/790fc140a9a124e8e7e97d2558681c9c2a4a582b..7e04a500df36a6476dc27c2a7a8d9abd4bdff6fd:/build/bakefiles/common.bkl
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index ac23bd5ecf..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
@@ -272,6 +276,13 @@
unicows
+
+ /MACHINE:AMD64
+ /MACHINE:AMD64
+ /MACHINE:IA64
+ /MACHINE:IA64
+
+
$(DEBUGINFO)
$(DEBUGRUNTIME)
@@ -292,6 +303,9 @@
$(_ldlibs.replace('ccrtrtti.lib', ''))
$(_cppflags.replace('/GR', ''))
+
+ $(LINK_TARGET_CPU)
+
@@ -385,8 +399,28 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\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"
+
+
+
+
+
@@ -420,6 +454,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
$(EXTRALIBS_GUI)
+
+ $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10
+
+ dos4gw
+
+
+
$(wxwin.mk_wxid(id))
__WX$(TOOLKIT)__
@@ -430,11 +471,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
$(THREAD_DEFINE)
$(UNICODE_DEFINE)
$(MSLU_DEFINE)
-
+ $(SETUPHDIR)
$(TOP_SRCDIR)include
$(LIBDIRNAME)
- $(SETUPHDIR)
+
+ $(MGLLIBPATH)
+ $(MGLLIBPATH)/$(MGLPMLIBPATH)
+
max
-wcd=549
@@ -467,6 +510,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+
+
+ mgl
+ mglcpp
+ pm
+
+
$(UNICOWS_LIB)
@@ -497,7 +547,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
advapi32
wsock32
-
+
oleacc
@@ -560,6 +610,14 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+
+
+
+ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+
+
+
+
$(wxwin.mkDllName(wxid))
$(WXDLLNAME)
@@ -572,9 +630,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
WXDLLNAME=$(WXDLLNAME)
-
- $(TOP_SRCDIR)include
-
+
+ $(RCDEFDIR)
+ $(TOP_SRCDIR)include
+
$(WXTOPDIR)src/msw/version.rc
@@ -594,6 +653,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+
+ $(DOLLAR)(%SCITECH)/include
+
$(INC_TIFF)
$(INC_JPEG)
$(INC_PNG)