X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8d58531558f19af910b11a9b0d2c481587b9f87..f24391587ce5794fac9043196bb04c0b4e293403:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 0222f6dee1..890518e233 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -161,7 +161,9 @@
 
     <set var="DIR_SUFFIX_CPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        <if cond="TARGET_CPU=='amd64'">_amd64</if>
         <if cond="TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="TARGET_CPU=='ia64'">_ia64</if>
         <if cond="TARGET_CPU=='IA64'">_ia64</if>
     </set>
 
@@ -275,7 +277,9 @@
     </set>
 
     <set var="LINK_TARGET_CPU">
+        <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
         <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
+        <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
     </set>
 
@@ -400,6 +404,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <msvc-headers-setup-h>
                 msw/genrcdefs.h
             </msvc-headers-setup-h>
+            <!-- FIXME: we need another way to get the compiler name -->
             <set var="VC_COMPILER">
                 <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
                 <if cond="FORMAT!='msevc4prj'">cl</if>
@@ -449,6 +454,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
     </set>
 
+    <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+        <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
+        <set var="MGLPMLIBPATH">
+            <if cond="DOS32=='DOS4GW'">dos4gw</if>
+        </set>
+    </if>
+
     <template id="wx" template="common_settings">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
@@ -462,6 +474,10 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>
+        <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
+            <lib-path>$(MGLLIBPATH)</lib-path>
+            <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
+        </if>
         <warnings>max</warnings>
         <cppflags-watcom>
             -wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
@@ -494,6 +510,13 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             </if>
         </if>
 
+        <!-- system libraries on mgl: -->
+        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+            <sys-lib>mgl</sys-lib>
+            <sys-lib>mglcpp</sys-lib>
+            <sys-lib>pm</sys-lib>
+        </if>
+
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
@@ -608,8 +631,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
             <res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
             <if cond="FORMAT=='autoconf'">
-                <res-include>$(TOP_SRCDIR)include</res-include>
                 <res-include>$(RCDEFDIR)</res-include>
+                <res-include>$(TOP_SRCDIR)include</res-include>
             </if>
         </if>
         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
@@ -630,6 +653,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     </template>
 
     <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
+        <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
+            <include>$(DOLLAR)(%SCITECH)/include</include>
+        </if>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
         <include>$(INC_PNG)</include>