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 cb546731b93a90b610352ca84bef3ecb7364a8c3..5325dd38433107d39aa258062a718db502cd612a 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -48,29 +48,40 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
 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
 OLEDIR=ole

-MSWDIR=.
+MSWDIR=$(WXDIR)\src\msw

 
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)\choicdgg.obj \
 
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= \
   $(GENDIR)\choicdgg.obj \

-  $(GENDIR)\colrdlgg.obj \
-  $(GENDIR)\fontdlgg.obj \

   $(GENDIR)\gridg.obj \
   $(GENDIR)\gridg.obj \

-  $(GENDIR)\helpxlp.obj \
-  $(GENDIR)\msgdlgg.obj \
+  $(GENDIR)\laywin.obj \

   $(GENDIR)\panelg.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
 
   $(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 \
 COMMONOBJS = \
   $(COMMDIR)\cmndata.obj \
   $(COMMDIR)\config.obj \


@@ -79,6 +90,7 @@ COMMONOBJS = \
   $(COMMDIR)\docview.obj \
   $(COMMDIR)\docmdi.obj \
   $(COMMDIR)\dynarray.obj \
   $(COMMDIR)\docview.obj \
   $(COMMDIR)\docmdi.obj \
   $(COMMDIR)\dynarray.obj \

+  $(COMMDIR)\dynlib.obj \

   $(COMMDIR)\event.obj \
   $(COMMDIR)\file.obj \
   $(COMMDIR)\filefn.obj \
   $(COMMDIR)\event.obj \
   $(COMMDIR)\file.obj \
   $(COMMDIR)\filefn.obj \


@@ -94,7 +106,6 @@ COMMONOBJS = \
   $(COMMDIR)\module.obj \
   $(COMMDIR)\odbc.obj \
   $(COMMDIR)\object.obj \
   $(COMMDIR)\module.obj \
   $(COMMDIR)\odbc.obj \
   $(COMMDIR)\object.obj \

-  $(COMMDIR)\postscrp.obj \

   $(COMMDIR)\prntbase.obj \
   $(COMMDIR)\resource.obj \
   $(COMMDIR)\tbarbase.obj \
   $(COMMDIR)\prntbase.obj \
   $(COMMDIR)\resource.obj \
   $(COMMDIR)\tbarbase.obj \


@@ -128,6 +139,7 @@ COMMONOBJS = \
   $(COMMDIR)\stream.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\objstrm.obj \
   $(COMMDIR)\stream.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\objstrm.obj \

+  $(COMMDIR)\variant.obj \

   $(COMMDIR)\wincmn.obj
 
 MSWOBJS = \
   $(COMMDIR)\wincmn.obj
 
 MSWOBJS = \


@@ -221,10 +233,11 @@ MSWOBJS = \
   $(OLEDIR)\uuid.obj
 
 
   $(OLEDIR)\uuid.obj
 
 

+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 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:
 
 # wxWindows library as DLL
 dll:


@@ -275,7 +288,7 @@ $(WXDIR)\lib\wx200.dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx200.lib
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\wx200.dll
     $(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

 <<
 
 ########################################################
 <<
 
 ########################################################


@@ -768,6 +781,11 @@ $(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(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$@
 $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@


@@ -974,16 +992,6 @@ $(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 

-#$(COMMDIR)/wxstrgnu/wxstrgnu.obj:     $*.$(SRCSUFF)
-#        cl @<<
-#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
-#<<
-
-#$(COMMDIR)/wxstrgnu/wxregex.obj:     $*.$(SRCSUFF)
-#        cl @<<
-#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
-#<<
-

 $(COMMDIR)/time.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 $(COMMDIR)/time.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@


@@ -1026,12 +1034,17 @@ $(CPPFLAGS2) /c $*.c /Fo$@
 
 $(COMMDIR)/process.obj:     $*.$(SRCSUFF)
         cl @<<
 
 $(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 @<<
 <<
 
 $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
         cl @<<

-$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@

 <<
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
 <<
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c


@@ -1074,6 +1087,11 @@ $(GENDIR)/helpxlp.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(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$@
 $(GENDIR)/msgdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@


@@ -1094,6 +1112,11 @@ $(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
 $(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$@
 $(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@


@@ -1126,13 +1149,33 @@ $(OBJECTS):     $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
 
 # 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:
 xpm:

-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\wxxpm

     nmake -f makefile.nt FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
 clean_xpm:
     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
 
     nmake -f makefile.nt clean
     cd $(WXDIR)\src\msw
 


@@ -1156,7 +1199,7 @@ clean_rcp:
     nmake -f makefile.nt clean
     cd $(WXDIR)\src\msw
 
     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
         -erase *.obj
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\*.pdb


@@ -1492,4 +1535,6 @@ $(WXDIR)\docs\ps\faq.ps:  $(WXDIR)\docs\latex\faq\faq.dvi
         move faq.ps $(WXDIR)\docs\ps\faq.ps
         cd $(THISDIR)
 
         move faq.ps $(WXDIR)\docs\ps\faq.ps
         cd $(THISDIR)
 

-
+# In order to force document reprocessing
+touchmanual:
+    -touch $(WXDIR)\docs\latex\wx\manual.tex