Added GetBordersForSizer(int *bordertop, int *borderOther)

[wxWidgets.git] / src / msw / makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 158f7d4b902bde97ff94f657be8d3cf130475eb4..7c1808e07c8d312ae451cddc3a1caa5fe0fd56fa 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -40,9 +40,6 @@ GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj &
        $(OUTPUTDIR)\numdlgg.obj &
        $(OUTPUTDIR)\panelg.obj &
        $(OUTPUTDIR)\progdlgg.obj &
-       $(OUTPUTDIR)\prop.obj &
-       $(OUTPUTDIR)\propform.obj &
-       $(OUTPUTDIR)\proplist.obj &
        $(OUTPUTDIR)\sashwin.obj &
        $(OUTPUTDIR)\scrlwing.obj &
        $(OUTPUTDIR)\spinctlg.obj &
@@ -54,7 +51,6 @@ GENERICOBJS= $(OUTPUTDIR)\busyinfo.obj &
        $(OUTPUTDIR)\tipdlg.obj &
        $(OUTPUTDIR)\tipwin.obj &
        $(OUTPUTDIR)\treectlg.obj &
-       $(OUTPUTDIR)\treelay.obj &
        $(OUTPUTDIR)\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
@@ -176,7 +172,6 @@ COMMONOBJS = &
        $(OUTPUTDIR)\quantize.obj &
        $(OUTPUTDIR)\radiocmn.obj &
        $(OUTPUTDIR)\regex.obj &
-       $(OUTPUTDIR)\resource.obj &
        $(OUTPUTDIR)\rgncmn.obj &
        $(OUTPUTDIR)\sckaddr.obj &
        $(OUTPUTDIR)\sckfile.obj &
@@ -190,6 +185,7 @@ COMMONOBJS = &
        $(OUTPUTDIR)\stream.obj &
        $(OUTPUTDIR)\string.obj &
        $(OUTPUTDIR)\sysopt.obj &
+       $(OUTPUTDIR)\taskbarcmn.obj &
        $(OUTPUTDIR)\tbarbase.obj &
        $(OUTPUTDIR)\textbuf.obj &
        $(OUTPUTDIR)\textcmn.obj &
@@ -359,7 +355,8 @@ $(ARCHINCDIR)\wx:
 $(OUTPUTDIR):
        @if not exist $^@ mkdir $^@
 
-$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
+$(SETUP_H): $(ARCHINCDIR)\wx
+    if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
        copy $(WXDIR)\include\wx\msw\setup.h $@
 
 LBCFILE=wx$(TOOLKIT).lbc
@@ -998,9 +995,6 @@ $(OUTPUTDIR)\radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 $(OUTPUTDIR)\regex.obj:     $(COMMDIR)\regex.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\resource.obj:     $(COMMDIR)\resource.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -1040,6 +1034,9 @@ $(OUTPUTDIR)\string.obj:     $(COMMDIR)\string.cpp
 $(OUTPUTDIR)\sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CXX) $(CXXFLAGS) $<
 
+$(OUTPUTDIR)\taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+
 $(OUTPUTDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CXX) $(CXXFLAGS) $<
 
@@ -1107,6 +1104,7 @@ $(OUTPUTDIR)\zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
@@ -1189,9 +1187,6 @@ $(OUTPUTDIR)\tipwin.obj:     $(GENDIR)\tipwin.cpp
 $(OUTPUTDIR)\treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CXX) $(CXXFLAGS) $<
 
-$(OUTPUTDIR)\treelay.obj:     $(GENDIR)\treelay.cpp
-  *$(CXX) $(CXXFLAGS) $<
-
 $(OUTPUTDIR)\wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CXX) $(CXXFLAGS) $<