Fixed drawing of the lines data, also ensure that only tuples are

[wxWidgets.git] / utils / dialoged / src / makefile.vc

diff --git a/utils/dialoged/src/makefile.vc b/utils/dialoged/src/makefile.vc
index 2cd2b30b2f1cbe7b92dd4d46c7294968155dc8f2..c5f320f6325ee6e44c173e2763b80e8a7def4501 100644 (file)
--- a/utils/dialoged/src/makefile.vc
+++ b/utils/dialoged/src/makefile.vc
@@ -11,12 +11,26 @@
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 

+
+# N.B. This makefiles uses CPPFLAGS2 to disable precompiled headers so we
+# can override optimization, which is necessary for correct behaviour under
+# VC++ 5 (otherwise deleting an object causes a crash).
+

 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 THISDIR = $(WXDIR)\utils\dialoged\src
 DOCDIR=$(WXDIR)\docs
 LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
 
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 THISDIR = $(WXDIR)\utils\dialoged\src
 DOCDIR=$(WXDIR)\docs
 LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
 

+FINAL=0
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\lib\wxdeprecatedd.lib
+!else
+EXTRALIBS=$(WXDIR)\lib\wxdeprecated.lib
+!endif
+
+OVERRIDEFLAGS=/Od
+

 PROGRAM=dialoged
  
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
 PROGRAM=dialoged
  
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\


@@ -29,67 +43,56 @@ all:    dialoged.exe
 
 dialoged.obj:      winprop.h reseditr.h dialoged.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 
 dialoged.obj:      winprop.h reseditr.h dialoged.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 winprop.obj:      winprop.h reseditr.h winprop.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 winprop.obj:      winprop.h reseditr.h winprop.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 reswrite.obj:      winprop.h reseditr.h reswrite.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 reswrite.obj:      winprop.h reseditr.h reswrite.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 reseditr.obj:      winprop.h reseditr.h reseditr.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 reseditr.obj:      winprop.h reseditr.h reseditr.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 edtree.obj:      winprop.h reseditr.h edtree.h edtree.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 edtree.obj:      winprop.h reseditr.h edtree.h edtree.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 edlist.obj:      winprop.h reseditr.h edlist.h edlist.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 edlist.obj:      winprop.h reseditr.h edlist.h edlist.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 dlghndlr.obj:      winprop.h reseditr.h dlghndlr.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 dlghndlr.obj:      winprop.h reseditr.h dlghndlr.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 symbtabl.obj:      symbtabl.h symbtabl.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 symbtabl.obj:      symbtabl.h symbtabl.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 winstyle.obj:      winstyle.h winstyle.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<
 <<
 
 winstyle.obj:      winstyle.h winstyle.$(SRCSUFF) $(DUMMYOBJ)
         $(cc) @<<

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

 <<
 
 <<
 

-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
-
-clean:
-        -erase *.obj
-        -erase *.sbr
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.pdb
-
-cleanutils: clean
-

 DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
  $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\tech.tex
 
 html: $(DOCDIR)\html\dialoged\dlged.htm
 DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
  $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\tech.tex
 
 html: $(DOCDIR)\html\dialoged\dlged.htm

+htmlhelp: $(DOCDIR)\htmlhelp\dialoged.chm
+htb:   $(DOCDIR)\htb\dialoged.htb

 hlp: $(DOCDIR)\winhelp\dialoged.hlp
 pdfrtf: $(DOCDIR)\pdf\dialoged.rtf
 ps: $(DOCDIR)\ps\dialoged.ps
 hlp: $(DOCDIR)\winhelp\dialoged.hlp
 pdfrtf: $(DOCDIR)\pdf\dialoged.rtf
 ps: $(DOCDIR)\ps\dialoged.ps


@@ -116,11 +119,30 @@ $(DOCDIR)\pdf\dialoged.rtf: $(DOCSOURCES)
 $(DOCDIR)\html\dialoged\dlged.htm:         $(DOCSOURCES)
         cd $(LOCALDOCDIR)
         -mkdir $(DOCDIR)\html\dialoged
 $(DOCDIR)\html\dialoged\dlged.htm:         $(DOCSOURCES)
         cd $(LOCALDOCDIR)
         -mkdir $(DOCDIR)\html\dialoged

+        -copy *.gif $(DOCDIR)\html\dialoged

         -start /w tex2rtf $(LOCALDOCDIR)\dialoged.tex $(DOCDIR)\html\dialoged\dlged.htm -twice -html
         -erase $(DOCDIR)\html\dialoged\*.con
         -erase $(DOCDIR)\html\dialoged\*.ref
         cd $(THISDIR)
 
         -start /w tex2rtf $(LOCALDOCDIR)\dialoged.tex $(DOCDIR)\html\dialoged\dlged.htm -twice -html
         -erase $(DOCDIR)\html\dialoged\*.con
         -erase $(DOCDIR)\html\dialoged\*.ref
         cd $(THISDIR)
 

+$(DOCDIR)\htmlhelp\dialoged.chm : $(DOCDIR)\html\dialoged\dlged.htm $(DOCDIR)\html\dialoged\dlged.hhp
+       cd $(DOCDIR)\html\dialoged
+       -hhc dlged.hhp
+    move $(DOCDIR)\html\dialoged\dlged.chm $(DOCDIR)\htmlhelp\dialoged.chm
+       cd $(THISDIR)
+
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\dialoged.htb: $(DOCDIR)\html\dialoged\dlged.htm
+       cd $(DOCDIR)\html\dialoged
+    -erase dialoged.zip dialoged.htb
+    zip dialoged.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move dialoged.zip $(DOCDIR)\htb\dialoged.htb
+    cd $(THISDIR)
+

 $(LOCALDOCDIR)\dialoged.dvi:   $(DOCSOURCES)
        cd $(LOCALDOCDIR)
         -latex dialoged
 $(LOCALDOCDIR)\dialoged.dvi:   $(DOCSOURCES)
        cd $(LOCALDOCDIR)
         -latex dialoged