cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/msw/makefile.sl b/src/msw/makefile.sl
index ffe534970a880f2331e4722c64ab93e80d4d83a4..1ca6d8dfa40882dbc6f8c911250c1462a7ec00b3 100644 (file)
--- a/src/msw/makefile.sl
+++ b/src/msw/makefile.sl
@@ -22,6 +22,7 @@ GENERICOBJS= choicdgg.obj \
   laywin.obj \
   panelg.obj \
   prop.obj \
+  progdlgg.obj \
   propform.obj \
   proplist.obj \
   sashwin.obj \
@@ -36,12 +37,12 @@ GENERICOBJS= choicdgg.obj \
 NONESSENTIALOBJS= printps.obj \
   prntdlgg.obj \
   msgdlgg.obj \
-  helpxlp.obj \
   colrdlgg.obj \
   fontdlgg.obj
 
 COMMONOBJS = cmndata.obj \
   config.obj \
+  dcbase.obj \
   docview.obj \
   docmdi.obj \
   dynarray.obj \
@@ -74,8 +75,10 @@ COMMONOBJS = cmndata.obj \
   date.obj \
   hash.obj \
   list.obj \
+  paper.obj \
   string.obj \
   socket.obj \
+  sckint.obj \
   sckaddr.obj \
   sckfile.obj \
   sckipc.obj \
@@ -96,11 +99,11 @@ COMMONOBJS = cmndata.obj \
   datstrm.obj \
   objstrm.obj \
   variant.obj \
-  wincmn.obj
+  wincmn.obj \
+  wxchar.obj
 
 # Can't compile these yet under Salford C++
 #  mimetype.obj \
-#  odbc.obj \
 #  db.obj \
 #  dbtable.obj \
 
@@ -113,6 +116,7 @@ MSWOBJS = \
   button.obj \
   checkbox.obj \
   checklst.obj \
+  caret.obj \
   choice.obj \
   clipbrd.obj \
   colordlg.obj \
@@ -136,7 +140,6 @@ MSWOBJS = \
   fontdlg.obj \
   frame.obj \
   gauge95.obj \
-  gaugemsw.obj \
   gdiobj.obj \
   helpwin.obj \
   icon.obj \
@@ -240,6 +243,9 @@ brush.obj:     $(MSWDIR)\brush.cpp
 button.obj:     $(MSWDIR)\button.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\button.cpp /BINARY button.obj
 
+caret.obj:     $(MSWDIR)\caret.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\caret.cpp /BINARY caret.obj
+
 choice.obj:     $(MSWDIR)\choice.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\choice.cpp /BINARY choice.obj
 
@@ -318,9 +324,6 @@ frame.obj:     $(MSWDIR)\frame.cpp
 gauge95.obj:     $(MSWDIR)\gauge95.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gauge95.cpp /BINARY gauge95.obj
 
-gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
-  $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gaugemsw.cpp /BINARY gaugemsw.obj
-
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(MSWDIR)\gdiobj.cpp /BINARY gdiobj.obj
 
@@ -506,6 +509,9 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\config.cpp /BINARY config.obj
 
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\dcbase.cpp /BINARY dcbase.obj
+
 db.obj:     $(COMMDIR)\db.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\db.cpp /BINARY db.obj
 
@@ -572,9 +578,6 @@ module.obj:     $(COMMDIR)\module.cpp
 object.obj:     $(COMMDIR)\object.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\object.cpp /BINARY object.obj
 
-odbc.obj:     $(COMMDIR)\odbc.cpp
-  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\odbc.cpp /BINARY odbc.obj
-
 prntbase.obj:     $(COMMDIR)\prntbase.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\prntbase.cpp /BINARY prntbase.obj
 
@@ -617,12 +620,18 @@ hash.obj:     $(COMMDIR)\hash.cpp
 list.obj:     $(COMMDIR)\list.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\list.cpp /BINARY list.obj
 
+paper.obj:     $(COMMDIR)\paper.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\paper.cpp /BINARY paper.obj
+
 string.obj:     $(COMMDIR)\string.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\string.cpp /BINARY string.obj
 
 socket.obj:     $(COMMDIR)\socket.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\socket.cpp /BINARY socket.obj
 
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckint.cpp /BINARY sckint.obj
+
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\sckaddr.cpp /BINARY sckaddr.obj
 
@@ -683,6 +692,9 @@ variant.obj:     $(COMMDIR)\variant.cpp
 wincmn.obj:     $(COMMDIR)\wincmn.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wincmn.cpp /BINARY wincmn.obj
 
+wxchar.obj:     $(COMMDIR)\wxcharp.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\wxchar.cpp /BINARY wxchar.obj
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
@@ -702,9 +714,6 @@ fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
 gridg.obj:     $(GENDIR)\gridg.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\gridg.cpp /BINARY gridg.obj
 
-helpxlp.obj:     $(GENDIR)\helpxlp.cpp
-  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\helpxlp.cpp /BINARY helpxlp.obj
-
 laywin.obj:     $(GENDIR)\laywin.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\laywin.cpp /BINARY laywin.obj
 
@@ -717,6 +726,9 @@ panelg.obj:     $(GENDIR)\panelg.cpp
 printps.obj:     $(GENDIR)\printps.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\printps.cpp /BINARY printps.obj
 
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
+  $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\progdlgg.cpp /BINARY progdlgg.obj
+
 prop.obj:     $(GENDIR)\prop.cpp
   $(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prop.cpp /BINARY prop.obj