Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various makefile and installation things.

Browse Source 
main() is now always in the program. Also added a
    macro that doesn't set main at all so that users
    can have their own.
  The isosurf sample doesn't work anymore.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-03-05 17:49:58 +00:00
parent 0649ebbdb7
commit c661ecca60
13 changed files with 562 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
Makefile.in
View File

@@ -42,12 +42,11 @@ VP8 = @top_srcdir@/src/jpeg
VP9 = @top_srcdir@/src/tiff VP9 = @top_srcdir@/src/tiff
VP10 = @top_srcdir@/src/zlib VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc VP11 = @top_srcdir@/src/iodbc
VP12 = @top_srcdir@/src/ogl
# the comment at the end of the next line is needed because otherwise autoconf # the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove # would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':' # any VPATH assignment not containing ':'
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12) # ':' for autoconf VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
prefix = @prefix@ prefix = @prefix@
@@ -108,7 +107,6 @@ SRCDIR = $(WXDIR)/src
GENDIR = $(WXDIR)/src/generic GENDIR = $(WXDIR)/src/generic
COMMDIR = $(WXDIR)/src/common COMMDIR = $(WXDIR)/src/common
HTMLDIR = $(WXDIR)/src/html HTMLDIR = $(WXDIR)/src/html
OGLDIR = $(WXDIR)/src/ogl
UNIXDIR = $(WXDIR)/src/unix UNIXDIR = $(WXDIR)/src/unix
PNGDIR = $(WXDIR)/src/png PNGDIR = $(WXDIR)/src/png
JPEGDIR = $(WXDIR)/src/jpeg JPEGDIR = $(WXDIR)/src/jpeg
@@ -338,7 +336,7 @@ CREATE_INSTALLED_LINKS: preinstall
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
CREATE_INSTALLED_LINKS_GL: preinstall CREATE_INSTALLED_LINKS_GL: preinstall_gl
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
@@ -412,6 +410,13 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_D
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done done
preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
@echo " "
@echo " Installing wxWindows OpenGl add-on..."
@echo " "
$(INSTALL) -d $(libdir)
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@ install: @AFMINSTALL@ @WX_ALL_INSTALLED@
@echo " " @echo " "
@echo " The installation of wxWindows is finished. On certain" @echo " The installation of wxWindows is finished. On certain"
@@ -462,7 +467,6 @@ uninstall:
@if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
@if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
@if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
@if test -d $(includedir)/wx/ogl; then rmdir $(includedir)/wx/ogl; fi
@if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
@if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
@@ -499,7 +503,6 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR) mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
mkdir $(DISTDIR)/include/wx/generic mkdir $(DISTDIR)/include/wx/generic
mkdir $(DISTDIR)/include/wx/html mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/ogl
mkdir $(DISTDIR)/include/wx/protocol mkdir $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/unix
cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
@@ -508,14 +511,12 @@ ALL_GUI_DIST: ALL_DIST
cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic
cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html cp $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
cp $(INCDIR)/wx/ogl/*.h $(DISTDIR)/include/wx/ogl
cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/src mkdir $(DISTDIR)/src
mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/generic mkdir $(DISTDIR)/src/generic
mkdir $(DISTDIR)/src/html mkdir $(DISTDIR)/src/html
mkdir $(DISTDIR)/src/ogl
mkdir $(DISTDIR)/src/html/bitmaps mkdir $(DISTDIR)/src/html/bitmaps
mkdir $(DISTDIR)/src/$(TOOLKITDIR) mkdir $(DISTDIR)/src/$(TOOLKITDIR)
mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/png
@@ -535,7 +536,6 @@ ALL_GUI_DIST: ALL_DIST
cp $(COMMDIR)/*.h $(DISTDIR)/src/common cp $(COMMDIR)/*.h $(DISTDIR)/src/common
cp $(COMMDIR)/*.y $(DISTDIR)/src/common cp $(COMMDIR)/*.y $(DISTDIR)/src/common
cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
cp $(OGLDIR)/*.cpp $(DISTDIR)/src/ogl
cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -667,16 +667,22 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/configure $(DISTDIR)/samples cp $(SAMPDIR)/configure $(DISTDIR)/samples
cp $(SAMPDIR)/configure.in $(DISTDIR)/samples cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
mkdir $(DISTDIR)/samples/calendar
cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar
cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar
cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar
mkdir $(DISTDIR)/samples/caret mkdir $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
mkdir $(DISTDIR)/samples/calendar mkdir $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/calendar/Makefile.in $(DISTDIR)/samples/calendar cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/calendar/makefile.unx $(DISTDIR)/samples/calendar cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/calendar/*.cpp $(DISTDIR)/samples/calendar cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
mkdir $(DISTDIR)/samples/config mkdir $(DISTDIR)/samples/config
cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
@@ -696,12 +702,6 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
mkdir $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
mkdir $(DISTDIR)/samples/db mkdir $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
@@ -738,6 +738,14 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi cp $(SAMPDIR)/docvwmdi/*.cpp $(DISTDIR)/samples/docvwmdi
cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi cp $(SAMPDIR)/docvwmdi/*.h $(DISTDIR)/samples/docvwmdi
mkdir $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/Makefile.in $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/makefile.unx $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/*.cpp $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/*.h $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/*.xpm $(DISTDIR)/samples/dragimag
cp $(SAMPDIR)/dragimag/*.png $(DISTDIR)/samples/dragimag
mkdir $(DISTDIR)/samples/drawing mkdir $(DISTDIR)/samples/drawing
cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing cp $(SAMPDIR)/drawing/Makefile.in $(DISTDIR)/samples/drawing
cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing cp $(SAMPDIR)/drawing/makefile.unx $(DISTDIR)/samples/drawing
@@ -754,12 +762,6 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
mkdir $(DISTDIR)/samples/font mkdir $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font
@@ -842,6 +844,12 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
mkdir $(DISTDIR)/samples/layout mkdir $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout
@@ -909,6 +917,32 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
mkdir $(DISTDIR)/samples/opengl
cp $(SAMPDIR)/opengl/Makefile.in $(DISTDIR)/samples/opengl
mkdir $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/Makefile.in $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/makefile.unx $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/*.cpp $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/*.c $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/*.h $(DISTDIR)/samples/opengl/penguin
cp $(SAMPDIR)/opengl/penguin/*.lwo $(DISTDIR)/samples/opengl/penguin
mkdir $(DISTDIR)/samples/opengl/cube
cp $(SAMPDIR)/opengl/cube/Makefile.in $(DISTDIR)/samples/opengl/cube
cp $(SAMPDIR)/opengl/cube/makefile.unx $(DISTDIR)/samples/opengl/cube
cp $(SAMPDIR)/opengl/cube/*.cpp $(DISTDIR)/samples/opengl/cube
cp $(SAMPDIR)/opengl/cube/*.h $(DISTDIR)/samples/opengl/cube
mkdir $(DISTDIR)/samples/opengl/isosurf
cp $(SAMPDIR)/opengl/isosurf/Makefile.in $(DISTDIR)/samples/opengl/isosurf
cp $(SAMPDIR)/opengl/isosurf/makefile.unx $(DISTDIR)/samples/opengl/isosurf
cp $(SAMPDIR)/opengl/isosurf/*.cpp $(DISTDIR)/samples/opengl/isosurf
cp $(SAMPDIR)/opengl/isosurf/*.h $(DISTDIR)/samples/opengl/isosurf
cp $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
mkdir $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
mkdir $(DISTDIR)/samples/png mkdir $(DISTDIR)/samples/png
cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png cp $(SAMPDIR)/png/makefile.unx $(DISTDIR)/samples/png
@@ -945,11 +979,6 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
mkdir $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/Makefile.in $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/makefile.unx $(DISTDIR)/samples/plot
cp $(SAMPDIR)/plot/*.cpp $(DISTDIR)/samples/plot
mkdir $(DISTDIR)/samples/proplist mkdir $(DISTDIR)/samples/proplist
cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
@@ -975,6 +1004,11 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
mkdir $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
mkdir $(DISTDIR)/samples/splitter mkdir $(DISTDIR)/samples/splitter
cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter
cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
@@ -1008,6 +1042,14 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.h $(DISTDIR)/samples/treectrl
cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl cp $(SAMPDIR)/treectrl/*.xpm $(DISTDIR)/samples/treectrl
mkdir $(DISTDIR)/samples/treectrl/bitmaps
cp $(SAMPDIR)/treectrl/bitmaps/*.bmp $(DISTDIR)/samples/treectrl/bitmaps
mkdir $(DISTDIR)/samples/treelay
cp $(SAMPDIR)/treelay/Makefile.in $(DISTDIR)/samples/treelay
cp $(SAMPDIR)/treelay/makefile.unx $(DISTDIR)/samples/treelay
cp $(SAMPDIR)/treelay/*.cpp $(DISTDIR)/samples/treelay
cp $(SAMPDIR)/treelay/*.h $(DISTDIR)/samples/treelay
mkdir $(DISTDIR)/samples/typetest mkdir $(DISTDIR)/samples/typetest
cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest cp $(SAMPDIR)/typetest/Makefile.in $(DISTDIR)/samples/typetest
@@ -1026,11 +1068,6 @@ SAMPLES_DIST: ALL_GUI_DIST
cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard
cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
mkdir $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets
cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets
UTILS_DIST: ALL_GUI_DIST UTILS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/utils mkdir $(DISTDIR)/utils
cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils

657
configure vendored
View File

File diff suppressed because it is too large Load Diff

25
configure.in
View File

@@ -1981,7 +1981,11 @@ if test "$wxUSE_SHARED" = "yes"; then
fi fi
WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl" WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl"
WX_ALL=${WX_LIBRARY_NAME_SHARED} if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
else
WX_ALL="${WX_LIBRARY_NAME_SHARED}"
fi
;; ;;
dnl in fact, these settings are for any platform using gcc dnl in fact, these settings are for any platform using gcc
@@ -1992,10 +1996,12 @@ if test "$wxUSE_SHARED" = "yes"; then
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
fi fi
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
else
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS" WX_ALL="CREATE_LINKS"
if test "$USE_GUI" = 1; then
WX_ALL="$WX_ALL CREATE_LINKS_GL"
fi fi
;; ;;
*-*-irix5* | *-*-irix6* ) *-*-irix5* | *-*-irix6* )
@@ -2005,10 +2011,12 @@ if test "$wxUSE_SHARED" = "yes"; then
else else
SHARED_LD="${CXX} -shared -o" SHARED_LD="${CXX} -shared -o"
fi fi
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
else
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS" WX_ALL="CREATE_LINKS"
if test "$USE_GUI" = 1; then
WX_ALL="$WX_ALL CREATE_LINKS_GL"
fi fi
;; ;;
*-*-solaris2* ) *-*-solaris2* )
@@ -2019,8 +2027,13 @@ if test "$wxUSE_SHARED" = "yes"; then
SHARED_LD="${CXX} -G -o" SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC" PIC_FLAG="-KPIC"
fi fi
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
WX_ALL="CREATE_LINKS CREATE_LINKS_GL" WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
else
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
;; ;;
*-*-sunos4* ) *-*-sunos4* )
SHARED_LD="${CC} -shared -o" SHARED_LD="${CC} -shared -o"

13
include/wx/app.h
View File

@@ -370,7 +370,7 @@ public:
// be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this
// code if required. // code if required.
#if !wxUSE_GUI || defined(__AIX__) || defined(__HPUX__) || defined( __VMS__ ) || defined(__WXPM__) #if !wxUSE_GUI || defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)
#define IMPLEMENT_WXWIN_MAIN \ #define IMPLEMENT_WXWIN_MAIN \
extern int wxEntry( int argc, char *argv[] ); \ extern int wxEntry( int argc, char *argv[] ); \
int main(int argc, char *argv[]) { return wxEntry(argc, argv); } int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
@@ -393,14 +393,21 @@ public:
#define IMPLEMENT_WXWIN_MAIN #define IMPLEMENT_WXWIN_MAIN
#endif #endif
// use this macro exactly once, the argument is the name of the wxApp-derived // Use this macro exactly once, the argument is the name of the wxApp-derived
// class which is the class of your application // class which is the class of your application.
#define IMPLEMENT_APP(appname) \ #define IMPLEMENT_APP(appname) \
wxApp *wxCreateApp() { return new appname; } \ wxApp *wxCreateApp() { return new appname; } \
wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \ wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \
appname& wxGetApp() { return *(appname *)wxTheApp; } \ appname& wxGetApp() { return *(appname *)wxTheApp; } \
IMPLEMENT_WXWIN_MAIN IMPLEMENT_WXWIN_MAIN
// Use this macro if you want to define your own main() or WinMain() function
// and call wxEntry() from there.
#define IMPLEMENT_APP_NO_MAIN(appname) \
wxApp *wxCreateApp() { return new appname; } \
wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \
appname& wxGetApp() { return *(appname *)wxTheApp; }
#define DECLARE_APP(appname) extern appname& wxGetApp(); #define DECLARE_APP(appname) extern appname& wxGetApp();
#endif #endif

8
samples/configure vendored
View File

@@ -2,7 +2,7 @@
# From configure.in Id: configure.in # From configure.in Id: configure.in
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13 # Generated automatically using autoconf version 2.14
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
# #
# This configure script is free software; the Free Software Foundation # This configure script is free software; the Free Software Foundation
@@ -334,7 +334,7 @@ EOF
verbose=yes ;; verbose=yes ;;
-version | --version | --versio | --versi | --vers) -version | --version | --versio | --versi | --vers)
echo "configure generated by autoconf version 2.13" echo "configure generated by autoconf version 2.14"
exit 0 ;; exit 0 ;;
-with-* | --with-*) -with-* | --with-*)
@@ -628,7 +628,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v) -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.13" echo "$CONFIG_STATUS generated by autoconf version 2.14"
exit 0 ;; exit 0 ;;
-help | --help | --hel | --he | --h) -help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;; echo "\$ac_cs_usage"; exit 0 ;;
@@ -686,6 +686,7 @@ trap 'rm -fr `echo "
thread/Makefile thread/Makefile
toolbar/Makefile toolbar/Makefile
treectrl/Makefile treectrl/Makefile
treelay/Makefile
typetest/Makefile typetest/Makefile
validate/Makefile validate/Makefile
sockets/Makefile sockets/Makefile
@@ -824,6 +825,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
thread/Makefile thread/Makefile
toolbar/Makefile toolbar/Makefile
treectrl/Makefile treectrl/Makefile
treelay/Makefile
typetest/Makefile typetest/Makefile
validate/Makefile validate/Makefile
sockets/Makefile sockets/Makefile

1
samples/configure.in
View File

@@ -54,6 +54,7 @@ AC_OUTPUT([
thread/Makefile thread/Makefile
toolbar/Makefile toolbar/Makefile
treectrl/Makefile treectrl/Makefile
treelay/Makefile
typetest/Makefile typetest/Makefile
validate/Makefile validate/Makefile
sockets/Makefile sockets/Makefile

20
samples/opengl/cube/makefile.unx
View File

@@ -11,13 +11,21 @@
PROGRAM=cube PROGRAM=cube
OPENGLHOME=/home/jacs/mesa/Mesa-2.3 CC = gcc
EXTRACPPFLAGS=-I$(OPENGLHOME)/include OBJECTS = $(PROGRAM).o
EXTRALDFLAGS=-L$(OPENGLHOME)/lib
EXTRALDLIBS=-lMesaGL -lMesaGLU
OBJECTS=$(PROGRAM).o # implementation
include ../../../src/makeprog.env .SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cflags` -o $@ $<
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
clean:
rm -f *.o $(PROGRAM)

8
samples/opengl/isosurf/isosurf.cpp
View File

@@ -330,12 +330,20 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event )
// OnPaint handlers must always create a wxPaintDC. // OnPaint handlers must always create a wxPaintDC.
wxPaintDC dc(this); wxPaintDC dc(this);
#ifndef __WXMOTIF__
if (!GetContext()) return;
#endif
draw1(); draw1();
SwapBuffers(); SwapBuffers();
} }
void TestGLCanvas::OnSize(wxSizeEvent& event) void TestGLCanvas::OnSize(wxSizeEvent& event)
{ {
#ifndef __WXMOTIF__
if (!GetContext()) return;
#endif
SetCurrent(); SetCurrent();
int width, height; int width, height;
GetClientSize(& width, & height); GetClientSize(& width, & height);

22
samples/opengl/isosurf/makefile.unx
View File

@@ -11,16 +11,24 @@
PROGRAM=isosurf PROGRAM=isosurf
OPENGLHOME=/home/jacs/mesa/Mesa-2.3 CC = gcc
EXTRACPPFLAGS=-I$(OPENGLHOME)/include OBJECTS = $(PROGRAM).o
EXTRALDFLAGS=-L$(OPENGLHOME)/lib
EXTRALDLIBS=-lMesaGL -lMesaGLU
OBJECTS=$(PROGRAM).o # implementation
EXTRATARGETS=isosurf.dat
include ../../../src/makeprog.env .SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cflags` -o $@ $<
all: $(PROGRAM) isosurf.dat
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
clean:
rm -f *.o $(PROGRAM)
isosurf.dat: isosurf.dat.gz isosurf.dat: isosurf.dat.gz
gzip -c -d isosurf.dat.gz > isosurf.dat gzip -c -d isosurf.dat.gz > isosurf.dat

22
samples/opengl/penguin/makefile.unx
View File

@@ -7,15 +7,23 @@
# #
# Makefile for penguin example (UNIX). # Makefile for penguin example (UNIX).
PROGRAM=penguin CPP = g++
CC = gcc
OPENGLHOME=/home/jacs/mesa/Mesa-2.3 Penguin: penguin.o trackball.o lw.o
$(CPP) -o Penguin \
penguin.o trackball.o lw.o \
`wx-config --libs` -lwx_gtk_gl -lMesaGL -lMesaGLU
EXTRACPPFLAGS=-I$(OPENGLHOME)/include # -I../../motif penguin.o: penguin.cpp
EXTRALDFLAGS=-L$(OPENGLHOME)/lib $(CPP) `wx-config --cflags` -I../../gtk -c penguin.cpp
EXTRALDLIBS=-lMesaGL -lMesaGLU
OBJECTS=$(PROGRAM).o trackball.o lw.o lw.o: lw.cpp
$(CPP) `wx-config --cflags` -I../../gtk -c lw.cpp
include ../../../src/makeprog.env trackball.o: trackball.c
$(CC) `wx-config --cflags` -I../../gtk -c trackball.c
clean:
rm -f *.o Penguin

17
src/gtk/main.cpp
View File

@@ -9,21 +9,6 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/app.h"
int wxEntry(int argc, char *argv[]); // We don't put main() in the library any more. RR.
#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
// main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
#else
int main(int argc, char* argv[])
{
return wxEntry(argc, argv);
}
#endif

17
src/gtk1/main.cpp
View File

@@ -9,21 +9,6 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/app.h"
int wxEntry(int argc, char *argv[]); // We don't put main() in the library any more. RR.
#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)
// main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
#else
int main(int argc, char* argv[])
{
return wxEntry(argc, argv);
}
#endif

12
wxGTK.spec
View File

@@ -30,7 +30,15 @@ Group: X11/Libraries
Requires: wxGTK Requires: wxGTK
%description devel %description devel
Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library. Header files for wxGTK, the GTK+ 1.2 port of the wxWindows library.
%package gl
Summary: The GTK+ 1.2 port of the wxWindows library, OpenGl add-on.
Group: X11/Libraries
Requires: wxGTK
%description gl
OpenGl add-on library files for wxGTK, the GTK+ 1.2 port of the wxWindows library.
%prep %prep
%setup -n wxGTK %setup -n wxGTK
@@ -73,3 +81,5 @@ rm -rf $RPM_BUILD_ROOT
%attr(755, -, -) %{pref}/bin/wxgtk-config %attr(755, -, -) %{pref}/bin/wxgtk-config
%attr(755, -, -) %{pref}/bin/wx-config %attr(755, -, -) %{pref}/bin/wx-config
%files gl
%attr(755, -, -) %{pref}/lib/libwx_gtk_gl*