Rewrote ConvertToStandardCommandArgs; resource.h correction; ntwxwin.mak

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

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index 7419e32be2e85d29b39466ad1e5692afd74f793e..5325dd38433107d39aa258062a718db502cd612a 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -48,34 +48,49 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
-GENDIR=..\generic
-COMMDIR=..\common
+# These are absolute paths, so that the compiler
+# generates correct __FILE__ symbols for debugging.
+# Otherwise you don't be able to double-click on a memory
+# error to load that file.
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
 OLEDIR=ole
-MSWDIR=.
+MSWDIR=$(WXDIR)\src\msw
 
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)\choicdgg.obj \
-  $(GENDIR)\colrdlgg.obj \
-  $(GENDIR)\fontdlgg.obj \
   $(GENDIR)\gridg.obj \
-  $(GENDIR)\helpxlp.obj \
-  $(GENDIR)\msgdlgg.obj \
+  $(GENDIR)\laywin.obj \
   $(GENDIR)\panelg.obj \
-  $(GENDIR)\printps.obj \
-  $(GENDIR)\prntdlgg.obj \
+  $(GENDIR)\sashwin.obj \
   $(GENDIR)\scrolwin.obj \
   $(GENDIR)\splitter.obj \
   $(GENDIR)\statusbr.obj \
   $(GENDIR)\tabg.obj \
   $(GENDIR)\textdlgg.obj
 
+# These are generic things that don't need to be compiled on MSW,
+# but sometimes it's useful to do so for testing purposes.
+NONESSENTIALOBJS= \
+  $(GENDIR)\printps.obj \
+  $(GENDIR)\prntdlgg.obj \
+  $(GENDIR)\msgdlgg.obj \
+  $(GENDIR)\helpxlp.obj \
+  $(GENDIR)\colrdlgg.obj \
+  $(GENDIR)\fontdlgg.obj \
+  $(COMMDIR)\postscrp.obj
+
 COMMONOBJS = \
   $(COMMDIR)\cmndata.obj \
   $(COMMDIR)\config.obj \
+  $(COMMDIR)\db.obj \
+  $(COMMDIR)\dbtable.obj \
   $(COMMDIR)\docview.obj \
+  $(COMMDIR)\docmdi.obj \
   $(COMMDIR)\dynarray.obj \
+  $(COMMDIR)\dynlib.obj \
   $(COMMDIR)\event.obj \
   $(COMMDIR)\file.obj \
   $(COMMDIR)\filefn.obj \
@@ -89,9 +104,8 @@ COMMONOBJS = \
   $(COMMDIR)\log.obj \
   $(COMMDIR)\memory.obj \
   $(COMMDIR)\module.obj \
-  $(COMMDIR)\object.obj \
   $(COMMDIR)\odbc.obj \
-  $(COMMDIR)\postscrp.obj \
+  $(COMMDIR)\object.obj \
   $(COMMDIR)\prntbase.obj \
   $(COMMDIR)\resource.obj \
   $(COMMDIR)\tbarbase.obj \
@@ -105,7 +119,16 @@ COMMONOBJS = \
   $(COMMDIR)\hash.obj \
   $(COMMDIR)\list.obj \
   $(COMMDIR)\string.obj \
+  $(COMMDIR)\socket.obj \
+  $(COMMDIR)\sckaddr.obj \
+  $(COMMDIR)\sckfile.obj \
+  $(COMMDIR)\sckipc.obj \
+  $(COMMDIR)\sckstrm.obj \
+  $(COMMDIR)\url.obj \
+  $(COMMDIR)\http.obj \
+  $(COMMDIR)\protocol.obj \
   $(COMMDIR)\time.obj \
+  $(COMMDIR)\tokenzr.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \
   $(COMMDIR)\extended.obj \
@@ -115,10 +138,12 @@ COMMONOBJS = \
   $(COMMDIR)\zstream.obj \
   $(COMMDIR)\stream.obj \
   $(COMMDIR)\datstrm.obj \
+  $(COMMDIR)\objstrm.obj \
+  $(COMMDIR)\variant.obj \
   $(COMMDIR)\wincmn.obj
 
-
 MSWOBJS = \
+  $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \
   $(MSWDIR)\bitmap.obj \
   $(MSWDIR)\bmpbuttn.obj \
@@ -155,6 +180,7 @@ MSWOBJS = \
   $(MSWDIR)\helpwin.obj \
   $(MSWDIR)\icon.obj \
   $(MSWDIR)\imaglist.obj \
+  $(MSWDIR)\iniconf.obj \
   $(MSWDIR)\joystick.obj \
   $(MSWDIR)\listbox.obj \
   $(MSWDIR)\listctrl.obj \
@@ -207,10 +233,11 @@ MSWOBJS = \
   $(OLEDIR)\uuid.obj
 
 
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
-all:    $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+all:    $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib $(LIBTARGET)
 
 # wxWindows library as DLL
 dll:
@@ -261,7 +288,7 @@ $(WXDIR)\lib\wx200.dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx200.lib
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\wx200.dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib
 <<
 
 ########################################################
@@ -275,6 +302,11 @@ dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h
 $(CPPFLAGS) $(MAKEPRECOMP) /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/accel.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(MSWDIR)/app.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
@@ -722,16 +754,38 @@ $(COMMDIR)/config.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(COMMDIR)/db.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/dbtable.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(COMMDIR)/docmdi.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(COMMDIR)/dynlib.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
@@ -762,6 +816,11 @@ $(COMMDIR)/gdicmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(COMMDIR)/iniconf.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(COMMDIR)/intl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
@@ -883,20 +942,55 @@ $(COMMDIR)/string.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
-$(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/socket.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
-#$(COMMDIR)/wxstrgnu/wxstrgnu.obj:     $*.$(SRCSUFF)
-#        cl @<<
-#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
-#<<
+$(COMMDIR)/sckaddr.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
 
-#$(COMMDIR)/wxstrgnu/wxregex.obj:     $*.$(SRCSUFF)
-#        cl @<<
-#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
-#<<
+$(COMMDIR)/sckfile.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/sckipc.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/sckstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/url.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/http.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/protocol.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/tokenzr.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
 
 $(COMMDIR)/time.obj:     $*.$(SRCSUFF)
         cl @<<
@@ -928,19 +1022,29 @@ $(COMMDIR)\datstrm.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(COMMDIR)\objstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(COMMDIR)/extended.obj:     $*.c
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.c /Fo$@
+$(CPPFLAGS2) /c $*.c /Fo$@
 <<
 
 $(COMMDIR)/process.obj:     $*.$(SRCSUFF)
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/variant.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
         cl @<<
-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
@@ -983,6 +1087,11 @@ $(GENDIR)/helpxlp.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(GENDIR)/laywin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(GENDIR)/msgdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
@@ -1003,6 +1112,11 @@ $(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(GENDIR)/sashwin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 $(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
@@ -1035,13 +1149,33 @@ $(OBJECTS):     $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.nt FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.nt clean
+    cd $(WXDIR)\src\msw
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.nt FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.nt clean
+    cd $(WXDIR)\src\msw
+
 xpm:
-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\wxxpm
     nmake -f makefile.nt FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
 clean_xpm:
-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\wxxpm
     nmake -f makefile.nt clean
     cd $(WXDIR)\src\msw
 
@@ -1065,7 +1199,7 @@ clean_rcp:
     nmake -f makefile.nt clean
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET)
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib
         -erase *.obj
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\*.pdb
@@ -1103,7 +1237,7 @@ cleanall: clean
 
 # Making documents
 docs:   hlp
-hlp:    wxhlp refhlp portinghlp # faqhlp
+hlp:    wxhlp portinghlp # faqhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 faqhlp: $(DOCDIR)/winhelp/faq.hlp
 refhlp: $(DOCDIR)/winhelp/techref.hlp
@@ -1401,4 +1535,6 @@ $(WXDIR)\docs\ps\faq.ps:  $(WXDIR)\docs\latex\faq\faq.dvi
         move faq.ps $(WXDIR)\docs\ps\faq.ps
         cd $(THISDIR)
 
-
+# In order to force document reprocessing
+touchmanual:
+    -touch $(WXDIR)\docs\latex\wx\manual.tex