From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 18 Mar 2000 20:11:10 +0000 (+0000)
Subject: Added def files for making OpenGL DLLs (Mingw32); added comment to wxHTML format
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fac2666314a63b763df2c8f91277e104d89f7428?ds=inline

Added def files for making OpenGL DLLs (Mingw32); added comment to wxHTML format
doc; added OpenGL libs to makeg95.env


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index a4ee94bc95..7676207376 100644
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -79,6 +79,7 @@ include/wx/msw/*.h
 include/wx/msw/*.rc
 include/wx/msw/ctl3d/*.h
 include/wx/msw/gnuwin32/*.h
+include/wx/msw/gnuwin32/*.def
 include/wx/msw/ole/*.h
 include/wx/msw/*.cur
 include/wx/msw/*.ico
diff --git a/docs/html/news.htm b/docs/html/news.htm
index 4753c1131f..ed9a244fa1 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,6 +18,19 @@ News
 </tr>
 </table>
 
+<H3><a name="release2_1_14">March 19th, 2000</H3><P>
+
+<ul>
+<li><a href="download.htm" target=wxmain>wxWindows 2.1.14</a> is now available for Windows, Motif and GTK.
+Again, great strides have been made since the previous official version (2.1.11), and 2.2 will be the next official
+stable version. Many things have been fixed and added but <a href="newver.htm">here</a> are some highlights.
+<li>Robin Dunn is contributing a wxStyledTextCtrl, a wrapper around the <a href="http://www.scintilla.org/" target=_new>Scintilla</a>
+styled text edit control. It can be used to provide syntax highlighting for various languages, and other applications.
+A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside wxWindows 2.1.14.
+<li>Guilhem Lavaux has reworked his MMedia sound and video class library and started its documentation;
+it too is available alongside 2.1.14 as mmedia.zip.
+</ul>
+
 <H3>January 14th, 2000</H3><P>
 
 <ul>
diff --git a/docs/install.txt b/docs/install.txt
index 04925e5207..cb87488c42 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -2,7 +2,7 @@
 
 NB: this file describes the installation of wxBase library. If you are using a
     GUI version of wxWindows, please refer to the install.txt in the
-    appropriate subdirectory!
+    appropriate subdirectory (msw, gtk, motif).
 
 0. Requirments and supported platforms
    -----------------------------------
diff --git a/docs/latex/wx/htmlhlpf.tex b/docs/latex/wx/htmlhlpf.tex
index af4ebdc9b7..efb11a99ec 100644
--- a/docs/latex/wx/htmlhlpf.tex
+++ b/docs/latex/wx/htmlhlpf.tex
@@ -7,6 +7,8 @@ your tex2rtf.ini file.
 (See \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} for help controller description.)
 
 A {\bf book} consists of three files : header file, contents file and index file.
+You can make a regular zip archive of these files, plus the HTML and any image files,
+for wxHTML (or helpview) to read; and the .zip file can optionally be renamed to .htb.
 
 \wxheading{Header file (.hhp)}
 
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 07af70937d..04311b7ad8 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -188,6 +188,11 @@ if necessary) that the project settings, especially the list of defined
 symbols, struct packing, etc. are exactly the same for all items in
 the project. After this, delete everything (including PCH) and recompile.
 
+Note (5): for some further notes about upgrading your project
+files to be compatible with wxWindows 2.1.14, please see
+"Highlights of wxWindows 2.1.14" from the Download page of the
+web site or CD-ROM.
+
 Visual C++ 1.5 compilation (16-bit)
 -----------------------------------
 
@@ -471,6 +476,19 @@ Notes:
 5. If there's a problem executing the windres program, try
    commenting out RCPREPROCESSOR in makeg95.env.
 
+6. OpenGL support should work with Mingw32 as-is. However,
+   if you wish to generate import libraries appropriate either for
+   the MS OpenGL libraries or the SGI OpenGL libraries, go to
+   include/wx/msw/gl and use:
+
+     dlltool -k -d opengl.def -llibopengl.a
+
+   for the SGI DLLs, or
+
+     dlltool -k -d opengl32.def -llibopengl32.a
+
+   and similarly for glu[32].def.
+
 References:
 
  - The GNU-WIN32 site is at
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a0370c5172..3e6d7d4af7 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -513,9 +513,6 @@
 
 #undef  wxUSE_DEBUG_NEW_ALWAYS
 #define wxUSE_DEBUG_NEW_ALWAYS          0
-
-#undef  wxUSE_GLCANVAS
-#define wxUSE_GLCANVAS                  0
 #endif
 
 // MFC duplicates these operators
diff --git a/src/makeg95.env b/src/makeg95.env
index a87b513ddf..79786db36c 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -154,7 +154,7 @@ WINLIBS=-lstdc++ -lgcc \
 	-lwinspool -lwinmm -lshell32 \
 	-lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
 	-lole32 -loleaut32 -luuid \
-	-lodbc32 -lwsock32#  -loldnames
+	-lodbc32 -lwsock32 -lopengl32 -lglu32 #  -loldnames
 
 #WINLIBS=-lstdc++ -lgcc \
 #	-lwinspool -lwinmm -lshell32 \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e79ff78cb2..4267138743 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -820,6 +820,17 @@ $(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         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.
+htb:
+	cd $(WXDIR)\docs\html\wx
+    -erase /Y wx.zip wx.htb
+    zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    ren wx.zip wx.htb
+    cd $(THISDIR)
+
 # In order to force document reprocessing
 touchmanual:
     -touch $(WXDIR)\docs\latex\wx\manual.tex
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 5e104e044d..add461b25a 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wxdll.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wxdll.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib uuid.lib rpcrt4.lib advapi32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wxdlld.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wxdlld.dll" /pdbtype:sept
 
 !ENDIF