more WinCE fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index a064a870d0a2bb9443fcb4a1c454177924f7f052..3965e4681a8d97b33f56c9d45fc58ba49651da75 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -372,7 +372,18 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>

-            <if cond="FORMAT!='borland'">
+            <if cond="FORMAT=='msevc4prj'">
+                <sys-lib>ole32</sys-lib>
+                <sys-lib>oleaut32</sys-lib>
+                <sys-lib>uuid</sys-lib>
+                <sys-lib>commctrl</sys-lib>
+                <sys-lib>commdlg</sys-lib>
+                <sys-lib>ceshell</sys-lib>
+                <sys-lib>aygshell</sys-lib>
+                <sys-lib>winsock</sys-lib>
+                <sys-lib>wininet</sys-lib>
+            </if>
+            <if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">

                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>


@@ -391,7 +402,9 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
             <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>

-            <sys-lib>odbc32</sys-lib>
+            <if cond="FORMAT!='msevc4prj'">
+                <sys-lib>odbc32</sys-lib>
+            </if>

         </if>
     </template>
 
         </if>
     </template>
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b6c47ba88ac95a8ec8a7e852809ef7d22628c14e..53fc4d9207a2d8eed7e6e0b943755d4d614169c7 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1076,7 +1076,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dcscreen.cpp
     src/msw/dialup.cpp
     src/msw/dib.cpp
     src/msw/dcscreen.cpp
     src/msw/dialup.cpp
     src/msw/dib.cpp

-    src/msw/dirdlg.cpp

     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/evtloop.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/evtloop.cpp


@@ -1110,6 +1109,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>

+
+<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+    src/msw/dirdlg.cpp
+</set>
+

 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp


@@ -1307,6 +1311,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <!-- Files used by WindowsCE port but not by desktop MSW port: -->
 <set var="WINCE_SRC" hints="files">
 
 <!-- Files used by WindowsCE port but not by desktop MSW port: -->
 <set var="WINCE_SRC" hints="files">

+    src/generic/dirdlgg.cpp

     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/filedlgwce.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/filedlgwce.cpp


@@ -2292,7 +2297,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>

-        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>

         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>