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
This commit is contained in:
Julian Smart
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
-----------------------------------
|
||||
|
||||
@@ -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)}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user