Added geometry option to setup.h; added some missing make and project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-12 10:14:58 +00:00
parent 7679ac6334
commit b9e5acef4d
34 changed files with 1436 additions and 14 deletions
--- a/contrib/src/canvas/CanvasVC.dsp
+++ b/contrib/src/canvas/CanvasVC.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="CanvasVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=CanvasVC - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "CanvasVC.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "CanvasVC.mak" CFG="CanvasVC - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "CanvasVC - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "CanvasVC - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "CanvasVC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\lib\canvas.lib"
+
+!ELSEIF  "$(CFG)" == "CanvasVC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\..\lib\canvasd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "CanvasVC - Win32 Release"
+# Name "CanvasVC - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\bbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\canvas.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\liner.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\polygon.cpp
+# End Source File
+# End Target
+# End Project
--- a/contrib/src/canvas/CanvasVC.dsw
+++ b/contrib/src/canvas/CanvasVC.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "CanvasVC"=.\CanvasVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/contrib/src/canvas/makefile.b32
+++ b/contrib/src/canvas/makefile.b32
@@ -0,0 +1,17 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds Canvas library for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+LIBTARGET=$(WXDIR)\lib\canvas.lib
+
+OBJECTS = bbox.obj canvas.obj liner.obj polygon.obj
+
+!include $(WXDIR)\src\makelib.b32
+
--- a/contrib/src/canvas/makefile.g95
+++ b/contrib/src/canvas/makefile.g95
@@ -0,0 +1,16 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows Plot library Cygwin/Mingw32).
+
+WXDIR = ../../..
+
+LIBTARGET=$(WXDIR)/lib/libcanvas.a
+OBJECTS = bbox.o canvas.o liner.o polygon.o
+
+include $(WXDIR)/src/makelib.g95
+
--- a/contrib/src/canvas/makefile.vc
+++ b/contrib/src/canvas/makefile.vc
@@ -0,0 +1,159 @@
+
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	2001
+# Updated:
+# Copyright:	(c) 2001, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds Plot class library (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+GIZMOSDIR = $(WXDIR)\contrib\src\canvas
+GIZMOSINC = $(WXDIR)\contrib\include\wx\canvas
+THISDIR = $(WXDIR)\contrib\src\canvas
+DOCDIR=$(WXDIR)\contrib\docs
+LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\canvas
+
+!include $(WXDIR)\src\makevc.env
+
+OBJECTS = $(D)\bbox.obj $(D)\canvas.obj $(D)\liner.obj $(D)\polygon.obj
+
+LIBTARGET=$(WXDIR)\lib\canvas$(LIBEXT).lib
+
+all:    $(D) $(LIBTARGET)
+
+$(D) :
+	mkdir $(D)
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.vc clean
+        cd $(THISDIR)
+
+$(LIBTARGET): $(OBJECTS)
+	-erase $(LIBTARGET)
+	$(implib) @<<
+-out:$(LIBTARGET)
+-machine:$(CPU)
+$(OBJECTS)
+<<
+
+$(D)\bbox.obj:      bbox.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\canvas.obj:      canvas.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\liner.obj:      liner.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+$(D)\polygon.obj:      polygon.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Fo$@ /Tp $(*B).$(SRCSUFF)
+<<
+
+clean:
+        -erase $(D)\*.obj
+        -erase *.sbr
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.pdb
+        -erase $(LIBTARGET)
+
+DOCSOURCES=$(LOCALDOCDIR)\canvas.tex \
+ $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
+ $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\intro.tex\
+ $(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex
+
+html: $(DOCDIR)\html\canvas\canvas.htm
+htmlhelp: $(DOCDIR)\htmlhelp\canvas.chm
+htb:	$(DOCDIR)\htb\canvas.htb
+hlp: $(DOCDIR)\winhelp\canvas.hlp
+pdfrtf: $(DOCDIR)\pdf\canvas.rtf
+ps: $(DOCDIR)\ps\canvas.ps
+
+touchmanual:
+	touch $(LOCALDOCDIR)\canvas.tex
+
+
+$(DOCDIR)\winhelp\canvas.hlp:         $(LOCALDOCDIR)\canvas.rtf $(LOCALDOCDIR)\canvas.hpj
+        cd $(LOCALDOCDIR)
+        -erase canvas.ph
+        hc canvas
+        move canvas.hlp $(DOCDIR)\winhelp\canvas.hlp
+        move canvas.cnt $(DOCDIR)\winhelp\canvas.cnt
+        cd $(THISDIR)
+
+$(LOCALDOCDIR)\canvas.rtf: $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\canvas.tex $(LOCALDOCDIR)\canvas.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)\pdf\canvas.rtf: $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -copy *.bmp $(DOCDIR)\pdf
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\canvas.tex $(DOCDIR)\pdf\canvas.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\canvas\canvas.htm:         $(DOCSOURCES)
+        cd $(LOCALDOCDIR)
+        -mkdir $(DOCDIR)\html\canvas
+        copy *.gif $(DOCDIR)\html\canvas
+        -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\canvas.tex $(DOCDIR)\html\canvas\canvas.htm -twice -html
+        -erase $(DOCDIR)\html\canvas\*.con
+        -erase *.con
+        -erase $(DOCDIR)\html\canvas\*.ref
+        cd $(THISDIR)
+
+$(DOCDIR)\htmlhelp\canvas.chm: $(DOCDIR)\html\canvas\canvas.htm $(DOCDIR)\html\canvas\canvas.hhp
+	cd $(DOCDIR)\html\canvas
+	-hhc canvas.hhp
+    move canvas.chm $(DOCDIR)\htmlhelp\canvas.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\canvas.htb: $(DOCDIR)\html\canvas\canvas.htm
+	cd $(DOCDIR)\html\canvas
+    -erase canvas.zip canvas.htb
+    zip canvas.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move canvas.zip $(DOCDIR)\htb\canvas.htb
+    cd $(THISDIR)
+
+$(LOCALDOCDIR)\canvas.dvi:	$(DOCSOURCES)
+	cd $(LOCALDOCDIR)
+        -latex canvas
+        -latex canvas
+        -makeindx canvas
+        -bibtex canvas
+        -latex canvas
+        -latex canvas
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\canvas.ps:	$(LOCALDOCDIR)\canvas.dvi
+	cd $(LOCALDOCDIR)
+        -dvips32 -o canvas.ps canvas
+        move canvas.ps $(WXDIR)\docs\ps\canvas.ps
+        cd $(THISDIR)
+