From: Julian Smart Date: Tue, 28 Dec 1999 13:57:57 +0000 (+0000) Subject: Removed references to separate prop and porting docs. Added imagtiff.cpp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1a3aa77fc73f8669047cf60f0b3437806735881e Removed references to separate prop and porting docs. Added imagtiff.cpp to VC++ project files. Added tiff library to makeproj.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/docsrc.rsp b/distrib/msw/docsrc.rsp index d343f70080..f988fd7c47 100644 --- a/distrib/msw/docsrc.rsp +++ b/distrib/msw/docsrc.rsp @@ -10,37 +10,6 @@ docs/latex/wx/*.bmp docs/latex/wx/*.gif docs/latex/wx/*.wmf -docs/latex/proplist/*.tex -docs/latex/proplist/*.sty -docs/latex/proplist/*.bib -docs/latex/proplist/*.hpj -docs/latex/proplist/*.ini -docs/latex/proplist/*.txt -docs/latex/proplist/*.cnt -docs/latex/proplist/*.eps -docs/latex/proplist/*.bmp -docs/latex/proplist/*.gif -docs/latex/proplist/*.wmf - -docs/latex/porting/*.tex -docs/latex/porting/*.sty -docs/latex/porting/*.bib -docs/latex/porting/*.hpj -docs/latex/porting/*.ini -docs/latex/porting/*.txt -docs/latex/porting/*.cnt -docs/latex/porting/*.eps -docs/latex/porting/*.gif -docs/latex/porting/*.bmp - -utils/wxhelp/docs/*.tex -utils/wxhelp/docs/*.txt -utils/wxhelp/docs/*.hpj -utils/wxhelp/docs/*.ini -utils/wxhelp/docs/*.bmp -utils/wxhelp/docs/*.wmf -utils/wxhelp/docs/*.gif - utils/tex2rtf/docs/*.tex utils/tex2rtf/docs/*.txt utils/tex2rtf/docs/*.hpj @@ -94,4 +63,3 @@ utils/dialoged/docs/*.bmp utils/dialoged/docs/*.wmf utils/dialoged/docs/*.gif - diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 7f162c810d..432f106017 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -382,31 +382,20 @@ cleanall: clean # Making documents docs: allhlp allhtml allpdfrtf alldocs: docs -hlp: wxhlp portinghlp +hlp: wxhlp wxhlp: $(DOCDIR)/winhelp/wx.hlp -prophlp: $(DOCDIR)/winhelp/prop.hlp refhlp: $(DOCDIR)/winhelp/techref.hlp rtf: $(DOCDIR)/winhelp/wx.rtf -proprtf: $(DOCDIR)/winhelp/prop.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf -proppdfrtf: $(DOCDIR)/pdf/prop.rtf refpdfrtf: $(DOCDIR)/pdf/techref.rtf -html: wxhtml portinghtml +html: wxhtml wxhtml: $(DOCDIR)\html\wx\wx.htm htmlhelp: $(DOCDIR)\html\wx\wx.chm -prophtml: $(DOCDIR)\html\proplist\prop.htm ps: wxps referencps wxps: $(WXDIR)\docs\ps\wx.ps -propps: $(WXDIR)\docs\ps\prop.ps referencps: $(WXDIR)\docs\ps\referenc.ps -portinghtml: $(DOCDIR)\html\porting\port.htm -portingrtf: $(DOCDIR)/winhelp/porting.rtf -portinghlp: $(DOCDIR)/winhelp/porting.hlp -portingpdfrtf: $(DOCDIR)/pdf/porting.rtf -portingps: $(WXDIR)\docs\ps\porting.ps - -allhlp: wxhlp portinghlp prophlp +allhlp: wxhlp cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc hlp cd $(THISDIR) @@ -426,7 +415,7 @@ allhlp: wxhlp portinghlp prophlp # cd $(WXDIR)\utils\wxgrid\src # nmake -f makefile.vc hlp -allhtml: wxhtml portinghtml prophtml +allhtml: wxhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html cd $(THISDIR) @@ -447,12 +436,12 @@ allhtml: wxhtml portinghtml prophtml # cd $(WXDIR)\utils\wxtree\src # nmake -f makefile.vc html -allps: wxps referencps portingps propps +allps: wxps referencps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc ps cd $(THISDIR) -allpdfrtf: pdfrtf portingpdfrtf proppdfrtf +allpdfrtf: pdfrtf cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc pdfrtf cd $(THISDIR) @@ -477,22 +466,6 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w move wx.cnt $(DOCDIR)\winhelp\wx.cnt cd $(THISDIR) -$(DOCDIR)/winhelp/porting.hlp: $(DOCDIR)/latex/porting/porting.rtf $(DOCDIR)/latex/porting/porting.hpj - cd $(DOCDIR)/latex/porting - -erase porting.ph - hc porting - move porting.hlp $(DOCDIR)\winhelp\porting.hlp - move porting.cnt $(DOCDIR)\winhelp\porting.cnt - cd $(THISDIR) - -$(DOCDIR)/winhelp/prop.hlp: $(DOCDIR)/latex/proplist/prop.rtf $(DOCDIR)/latex/proplist/prop.hpj - cd $(DOCDIR)/latex/proplist - -erase prop.ph - hc prop - move prop.hlp $(DOCDIR)\winhelp\prop.hlp - move prop.cnt $(DOCDIR)\winhelp\prop.cnt - cd $(THISDIR) - $(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj cd $(DOCDIR)/latex/techref -erase techref.ph @@ -506,16 +479,6 @@ $(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/late -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp cd $(THISDIR) -$(DOCDIR)/latex/porting/porting.rtf: $(DOCDIR)/latex/porting/porting.tex - cd $(DOCDIR)\latex\porting - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/latex/porting/porting.rtf -twice -winhelp - cd $(THISDIR) - -$(DOCDIR)/latex/proplist/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/prop.rtf -twice -winhelp - cd $(THISDIR) - $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp @@ -528,20 +491,6 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/ -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf cd $(THISDIR) -$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex - cd $(DOCDIR)\latex\porting - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf - cd $(THISDIR) - -$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex - cd $(DOCDIR)\latex\proplist - -copy *.wmf $(DOCDIR)\pdf - -copy *.bmp $(DOCDIR)\pdf - -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf - cd $(THISDIR) - $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex cd $(DOCDIR)\latex\techref -copy *.wmf $(DOCDIR)\pdf @@ -564,27 +513,6 @@ $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp -hhc wx.hhp cd $(THISDIR) - -$(DOCDIR)\html\porting\port.htm: $(DOCDIR)\latex\porting\porting.tex - cd $(DOCDIR)\latex\porting - -mkdir $(DOCDIR)\html\porting - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\porting\porting.tex $(DOCDIR)\html\porting\port.htm -twice -html - -erase $(DOCDIR)\html\porting\*.con - -erase $(DOCDIR)\html\porting\*.ref - -erase $(DOCDIR)\latex\porting\*.con - -erase $(DOCDIR)\latex\porting\*.ref - cd $(THISDIR) - -$(DOCDIR)\html\proplist\prop.htm: $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\latex\proplist\body.tex $(DOCDIR)\latex\proplist\classes.tex $(DOCDIR)\latex\proplist\changes.tex - cd $(DOCDIR)\latex\proplist - -mkdir $(DOCDIR)\html\proplist - -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\proplist\prop.tex $(DOCDIR)\html\proplist\prop.htm -twice -html - -erase $(DOCDIR)\html\proplist\*.con - -erase $(DOCDIR)\html\proplist\*.ref - -erase $(DOCDIR)\latex\proplist\*.con - -erase $(DOCDIR)\latex\proplist\*.ref - cd $(THISDIR) - $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex cd $(WXDIR)\docs\latex\wx -latex manual @@ -595,28 +523,12 @@ $(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/w -latex manual cd $(THISDIR) -$(WXDIR)\docs\latex\porting\porting.dvi: $(DOCDIR)/latex/porting/porting.tex - cd $(WXDIR)\docs\latex\porting - -latex porting - -latex porting - -makeindx porting - -bibtex porting - -latex porting - -latex porting - cd $(THISDIR) - $(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi cd $(WXDIR)\docs\latex\wx -dvips32 -o wx.ps manual move wx.ps $(WXDIR)\docs\ps\wx.ps cd $(THISDIR) -$(WXDIR)\docs\ps\porting.ps: $(WXDIR)\docs\latex\porting\porting.dvi - cd $(WXDIR)\docs\latex\porting - -dvips32 -o porting.ps porting - move porting.ps $(WXDIR)\docs\ps\porting.ps - cd $(THISDIR) - $(WXDIR)\docs\latex\wx\referenc.dvi: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex cd $(WXDIR)\docs\latex\wx -latex referenc diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt index 0ee98df843..b76d68454d 100644 --- a/distrib/msw/wisebott.txt +++ b/distrib/msw/wisebott.txt @@ -40,11 +40,6 @@ item: Create Shortcut Destination=%GROUP%\Object Graphics Library Help.lnk Working Directory=%MAINDIR% end -item: Create Shortcut - Source=%MAINDIR%\docs\winhelp\prop.hlp - Destination=%GROUP%\wxProperty Classes Help.lnk - Working Directory=%MAINDIR% -end item: Create Shortcut Source=%MAINDIR%\docs\winhelp\tex2rtf.hlp Destination=%GROUP%\Tex2RTF Help.lnk @@ -131,12 +126,6 @@ item: Add ProgMan Icon Command Line=%MAINDIR%\docs\winhelp\ogl.hlp Default Directory=%MAINDIR% end -item: Add ProgMan Icon - Group=%GROUP% - Icon Name=wxProperty Classes Help - Command Line=%MAINDIR%\docs\winhelp\prop.hlp - Default Directory=%MAINDIR% -end item: Add ProgMan Icon Group=%GROUP% Icon Name=Tex2RTF Help diff --git a/docs/msw/install.txt b/docs/msw/install.txt index dee174b790..3106546ca8 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -92,7 +92,8 @@ Using project files: Debug and Release configurations. If you have VC++ 4, use makefile.vc, but you may only have one set of object files at a time in use (debug or release versions). -4. Open a sample project file, choose a configuration, and compile. +4. Open a sample project file, choose a configuration using + Build | Set Active Configuration..., and compile. The project files don't use precompiled headers, to save space, but you can switch PCH compiling on for greater speed. diff --git a/src/wxvc.dsp b/src/wxvc.dsp index 7ff8790d74..eaa5f1966d 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -271,6 +271,11 @@ SOURCE=.\common\imagpnm.cpp # End Source File # Begin Source File +SOURCE=.\common\imagtiff.cpp +# ADD CPP /I "tiff" /I "zlib" +# End Source File +# Begin Source File + SOURCE=.\common\intl.cpp # End Source File # Begin Source File diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index e9e4e824b1..ca016d7841 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -270,6 +270,11 @@ SOURCE=.\common\imagpng.cpp # End Source File # Begin Source File +SOURCE=.\common\imagtiff.cpp +# ADD CPP /I "tiff" /I "zlib" +# End Source File +# Begin Source File + SOURCE=.\common\intl.cpp # End Source File # Begin Source File diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index 8f85989f9b..00f16d9161 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -170,6 +170,8 @@ bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetNa wxString relativeReleasePath(relativeRootPath + wxString("/src/Release")); wxString relativeDebugPathJPEG(relativeRootPath + wxString("/src/jpeg/Debug")); wxString relativeReleasePathJPEG(relativeRootPath + wxString("/src/jpeg/Release")); + wxString relativeDebugPathTIFF(relativeRootPath + wxString("/src/tiff/Debug")); + wxString relativeReleasePathTIFF(relativeRootPath + wxString("/src/tiff/Release")); wxProject project; @@ -177,8 +179,8 @@ bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetNa project.SetIncludeDirs(wxStringList((const char*) relativeIncludePath, 0)); project.SetResourceIncludeDirs(wxStringList((const char*) relativeIncludePath, 0)); project.SetLibDirs(wxStringList((const char*) relativeLibPath, 0)); - project.SetDebugLibDirs(wxStringList((const char*) relativeDebugPath, (const char*) relativeDebugPathJPEG, 0)); - project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, 0)); + project.SetDebugLibDirs(wxStringList((const char*) relativeDebugPath, (const char*) relativeDebugPathJPEG, (const char*) relativeDebugPathTIFF, 0)); + project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, (const char*) relativeReleasePathTIFF, 0)); project.SetProjectName(projectName); project.SetTargetName(targetName); @@ -656,7 +658,7 @@ bool wxProject::GenerateVCProject() stream << "# ADD BSC32 /nologo\n"; stream << "LINK32=link.exe\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /machine:I386\n"; - stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib "; + stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib tiff.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) { @@ -716,7 +718,7 @@ bool wxProject::GenerateVCProject() stream << "# ADD BSC32 /nologo\n"; stream << "LINK32=link.exe\n"; stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n"; - stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib "; + stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxvc.lib jpeg.lib tiff.lib "; n = m_extraLibs.Number(); for (i = 0; i < n; i++) {