Various changes due to OGL and glcanvas having changed
position. Had to butcher Vadims system header patch. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
69
Makefile.in
69
Makefile.in
@@ -42,11 +42,12 @@ VP8 = @top_srcdir@/src/jpeg
|
||||
VP9 = @top_srcdir@/src/tiff
|
||||
VP10 = @top_srcdir@/src/zlib
|
||||
VP11 = @top_srcdir@/src/iodbc
|
||||
VP12 = @top_srcdir@/src/ogl
|
||||
|
||||
# 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
|
||||
# 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) # ':' 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)@PATH_IFS@$(VP12) # ':' for autoconf
|
||||
|
||||
top_srcdir = @top_srcdir@
|
||||
prefix = @prefix@
|
||||
@@ -107,6 +108,7 @@ SRCDIR = $(WXDIR)/src
|
||||
GENDIR = $(WXDIR)/src/generic
|
||||
COMMDIR = $(WXDIR)/src/common
|
||||
HTMLDIR = $(WXDIR)/src/html
|
||||
OGLDIR = $(WXDIR)/src/ogl
|
||||
UNIXDIR = $(WXDIR)/src/unix
|
||||
PNGDIR = $(WXDIR)/src/png
|
||||
JPEGDIR = $(WXDIR)/src/jpeg
|
||||
@@ -128,6 +130,7 @@ DOCDIR = $(WXDIR)/docs
|
||||
########################## Archive name ###############################
|
||||
|
||||
WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
|
||||
WXGLARCHIVE = @DISTDIR@-gl-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
|
||||
WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
|
||||
WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
|
||||
DISTDIR = ./_dist_dir/@DISTDIR@
|
||||
@@ -286,6 +289,7 @@ IODBCOBJS = \
|
||||
############################## Rules ##################################
|
||||
|
||||
BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@
|
||||
BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@
|
||||
|
||||
all: @WX_ALL@
|
||||
|
||||
@@ -294,10 +298,19 @@ all: @WX_ALL@
|
||||
$(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS)
|
||||
$(RANLIB) ./lib/$@
|
||||
|
||||
@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
|
||||
@$(INSTALL) -d ./lib
|
||||
$(AR) $(AROPTIONS) ./lib/$@ glcanvas.o
|
||||
$(RANLIB) ./lib/$@
|
||||
|
||||
@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
|
||||
@$(INSTALL) -d ./lib
|
||||
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
|
||||
|
||||
@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
|
||||
@$(INSTALL) -d ./lib
|
||||
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
|
||||
|
||||
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK1@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK2@
|
||||
@@ -307,6 +320,15 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
|
||||
|
||||
CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
|
||||
@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
|
||||
cd lib \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
|
||||
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
|
||||
|
||||
CREATE_INSTALLED_LINKS: preinstall
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||
@@ -316,6 +338,15 @@ CREATE_INSTALLED_LINKS: preinstall
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
|
||||
|
||||
CREATE_INSTALLED_LINKS_GL: preinstall
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
||||
cd $(libdir) \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
|
||||
&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
|
||||
|
||||
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
|
||||
|
||||
parser.o: parser.c lexer.c
|
||||
@@ -403,6 +434,11 @@ uninstall:
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
|
||||
@echo " Removing GL library..."
|
||||
@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
||||
@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
||||
@echo " Removing helper files..."
|
||||
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
|
||||
@$(RM) $(bindir)/wx-config
|
||||
@@ -426,6 +462,7 @@ uninstall:
|
||||
@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/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/generic; then rmdir $(includedir)/wx/generic; fi
|
||||
@if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi
|
||||
@@ -462,6 +499,7 @@ ALL_GUI_DIST: ALL_DIST
|
||||
mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
|
||||
mkdir $(DISTDIR)/include/wx/generic
|
||||
mkdir $(DISTDIR)/include/wx/html
|
||||
mkdir $(DISTDIR)/include/wx/ogl
|
||||
mkdir $(DISTDIR)/include/wx/protocol
|
||||
mkdir $(DISTDIR)/include/wx/unix
|
||||
cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx
|
||||
@@ -470,12 +508,14 @@ ALL_GUI_DIST: ALL_DIST
|
||||
cp $(INCDIR)/wx/generic/*.h $(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/ogl/*.h $(DISTDIR)/include/wx/ogl
|
||||
cp $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
|
||||
cp $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
|
||||
mkdir $(DISTDIR)/src
|
||||
mkdir $(DISTDIR)/src/common
|
||||
mkdir $(DISTDIR)/src/generic
|
||||
mkdir $(DISTDIR)/src/html
|
||||
mkdir $(DISTDIR)/src/ogl
|
||||
mkdir $(DISTDIR)/src/html/bitmaps
|
||||
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
|
||||
mkdir $(DISTDIR)/src/png
|
||||
@@ -495,6 +535,7 @@ ALL_GUI_DIST: ALL_DIST
|
||||
cp $(COMMDIR)/*.h $(DISTDIR)/src/common
|
||||
cp $(COMMDIR)/*.y $(DISTDIR)/src/common
|
||||
cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
|
||||
cp $(OGLDIR)/*.cpp $(DISTDIR)/src/ogl
|
||||
cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
|
||||
cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
|
||||
cp $(PNGDIR)/*.h $(DISTDIR)/src/png
|
||||
@@ -996,32 +1037,6 @@ UTILS_DIST: ALL_GUI_DIST
|
||||
cp $(UTILSDIR)/configure $(DISTDIR)/utils
|
||||
cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
|
||||
|
||||
mkdir $(DISTDIR)/utils/wxMMedia2
|
||||
mkdir $(DISTDIR)/utils/wxMMedia2/lib
|
||||
mkdir $(DISTDIR)/utils/wxMMedia2/sample
|
||||
cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
|
||||
cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
|
||||
cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
|
||||
cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
|
||||
cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
|
||||
cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
|
||||
cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
|
||||
|
||||
mkdir $(DISTDIR)/utils/glcanvas
|
||||
mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||
cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
|
||||
cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
|
||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||
cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
|
||||
|
||||
mkdir $(DISTDIR)/utils/ogl
|
||||
mkdir $(DISTDIR)/utils/ogl/src
|
||||
cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
|
||||
cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
|
||||
cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
|
||||
cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
|
||||
|
||||
MISC_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/misc
|
||||
mkdir $(DISTDIR)/misc/afm
|
||||
|
||||
131
configure.in
131
configure.in
@@ -288,48 +288,6 @@ AC_DEFUN(WX_ARG_CACHE_FLUSH,
|
||||
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
|
||||
])
|
||||
|
||||
dnl this macro checks for a three-valued command line --with argument:
|
||||
dnl possible arguments are 'yes', 'no', or 'sys'
|
||||
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
|
||||
AC_DEFUN(WX_ARG_SYS_WITH,
|
||||
[
|
||||
AC_MSG_CHECKING("for --with-$1")
|
||||
no_cache=0
|
||||
AC_ARG_WITH($1, $2,
|
||||
[
|
||||
if test "$withval" = yes; then
|
||||
ac_cv_use_$1='$3=yes'
|
||||
elif test "$withval" = sys; then
|
||||
ac_cv_use_$1='$3=sys'
|
||||
else
|
||||
ac_cv_use_$1='$3=no'
|
||||
fi
|
||||
],
|
||||
[
|
||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_$1='$3='$DEFAULT_$3
|
||||
])
|
||||
|
||||
eval "$ac_cv_use_$1"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$$3" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
elif test "$$3" = no; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_MSG_RESULT(system version)
|
||||
fi
|
||||
])
|
||||
|
||||
dnl this macro checks for a command line argument and caches the result
|
||||
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
|
||||
AC_DEFUN(WX_ARG_WITH,
|
||||
@@ -694,6 +652,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_LIBJPEG=no
|
||||
DEFAULT_wxUSE_LIBTIFF=no
|
||||
DEFAULT_wxUSE_ODBC=no
|
||||
DEFAULT_wxUSE_OPENGL=no
|
||||
|
||||
DEFAULT_wxUSE_STD_IOSTREAM=no
|
||||
DEFAULT_wxUSE_FILE=no
|
||||
@@ -813,6 +772,7 @@ else
|
||||
DEFAULT_wxUSE_LIBJPEG=yes
|
||||
DEFAULT_wxUSE_LIBTIFF=yes
|
||||
DEFAULT_wxUSE_ODBC=no
|
||||
DEFAULT_wxUSE_OPENGL=no
|
||||
|
||||
DEFAULT_wxUSE_STD_IOSTREAM=no
|
||||
DEFAULT_wxUSE_FILE=yes
|
||||
@@ -958,7 +918,7 @@ fi
|
||||
dnl for GUI only
|
||||
|
||||
WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
|
||||
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
|
||||
WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
|
||||
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
|
||||
|
||||
dnl ====================
|
||||
@@ -1825,8 +1785,8 @@ if test "$wxUSE_MOTIF" = 1; then
|
||||
version = XpmLibraryVersion();
|
||||
],
|
||||
[
|
||||
XPM_LINK="-lXpm "
|
||||
AC_DEFINE(wxHAVE_LIB_XPM)
|
||||
XPM_LINK="-lXpm "
|
||||
AC_DEFINE(wxHAVE_LIB_XPM)
|
||||
AC_MSG_RESULT(found in default search path)
|
||||
COMPILED_X_PROGRAM=0
|
||||
],
|
||||
@@ -1882,7 +1842,7 @@ fi
|
||||
WX_LIBRARY="wx_${TOOLKIT_DIR}"
|
||||
|
||||
dnl the sources, their dependenices and the headers
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS)"
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
|
||||
|
||||
dnl ODBC objects are Unix only
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
@@ -1903,7 +1863,7 @@ fi
|
||||
if test "$wxUSE_ZLIB" = "yes" ; then
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
|
||||
fi
|
||||
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
|
||||
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
|
||||
|
||||
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
|
||||
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
|
||||
@@ -1936,17 +1896,23 @@ fi
|
||||
|
||||
dnl the name of the (libtool) library
|
||||
WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
|
||||
WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la"
|
||||
|
||||
dnl the name of the static library
|
||||
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
|
||||
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
|
||||
|
||||
dnl the name of the shared library
|
||||
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
||||
|
||||
dnl the name of the links to the shared library
|
||||
WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
|
||||
WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
|
||||
WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
|
||||
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
|
||||
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
|
||||
WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
|
||||
|
||||
dnl shared library settings
|
||||
SHARED_LD=
|
||||
@@ -1968,6 +1934,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
PIC_FLAG="+Z"
|
||||
fi
|
||||
WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
|
||||
WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl"
|
||||
WX_ALL=${WX_LIBRARY_NAME_SHARED}
|
||||
;;
|
||||
|
||||
@@ -1975,11 +1942,12 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
*-*-linux* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
if test "$wxUSE_BURNT_NAME" = "yes" ; then
|
||||
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
|
||||
BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
|
||||
fi
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
|
||||
;;
|
||||
*-*-irix5* | *-*-irix6* )
|
||||
if test "$GCC" = yes ; then
|
||||
@@ -1989,7 +1957,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
fi
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
|
||||
;;
|
||||
*-*-solaris2* )
|
||||
if test "$GCC" = yes ; then
|
||||
@@ -2000,7 +1968,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
PIC_FLAG="-KPIC"
|
||||
fi
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
|
||||
;;
|
||||
*-*-sunos4* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
@@ -2039,11 +2007,13 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
*-*-cygwin32* )
|
||||
dnl only static for now
|
||||
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
|
||||
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
|
||||
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
|
||||
;;
|
||||
*-*-mingw32* )
|
||||
dnl only static for now
|
||||
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
|
||||
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
|
||||
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
|
||||
;;
|
||||
*-pc-os2_emx )
|
||||
@@ -2066,10 +2036,12 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
dnl set target to shared if not explicitly chose static before
|
||||
if test "x$WX_TARGET_LIBRARY" = "x"; then
|
||||
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
|
||||
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
|
||||
fi
|
||||
else
|
||||
dnl set target to static
|
||||
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
|
||||
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
|
||||
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
|
||||
fi
|
||||
|
||||
@@ -2545,18 +2517,9 @@ dnl Optional libraries
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
ZLIB_INCLUDE=
|
||||
if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
|
||||
if test "$wxUSE_ZLIB" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_ZLIB)
|
||||
if test "$wxUSE_ZLIB" = "yes" ; then
|
||||
ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
|
||||
else
|
||||
ZLIB_LINK=
|
||||
AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, [ ZLIB_LINK="-lz" ]))
|
||||
|
||||
if test "x$ZLIB_LINK" = "x" ; then
|
||||
AC_MSG_ERROR(system zlib compression library not found! Use --with-zlib=yes to use built-in zlib)
|
||||
fi
|
||||
fi
|
||||
ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
|
||||
fi
|
||||
|
||||
PNG_INCLUDE=
|
||||
@@ -2580,17 +2543,15 @@ fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
AC_CHECK_HEADER(GL/gl.h, [
|
||||
AC_CHECK_LIB(GL, glInitNames, [
|
||||
AC_DEFINE(wxUSE_OPENGL)
|
||||
AC_DEFINE(wxUSE_GLCANVAS)
|
||||
AC_CHECK_LIB(GL, glFlush, [
|
||||
OPENGL_LINK="-lGL"
|
||||
AC_DEFINE(wxUSE_OPENGL)
|
||||
UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
|
||||
],[
|
||||
AC_CHECK_LIB(MesaGL, glInitNames, [
|
||||
AC_CHECK_LIB(MesaGL, glFlush, [
|
||||
OPENGL_LINK="-lMesaGL"
|
||||
AC_DEFINE(wxUSE_OPENGL)
|
||||
UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
|
||||
],wxUSE_OPENGL=0)
|
||||
],wxUSE_OPENGL=0)
|
||||
],)
|
||||
],)
|
||||
],wxUSE_OPENGL=0)
|
||||
fi
|
||||
|
||||
@@ -3413,7 +3374,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl Output the makefiles and such from the results found above
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
|
||||
GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $TOOLKIT_LINK"
|
||||
|
||||
dnl all additional libraries (except wxWindows itself) we link with
|
||||
EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
|
||||
@@ -3485,6 +3446,16 @@ AC_SUBST(WX_LIBRARY_LINK2)
|
||||
AC_SUBST(WX_LIBRARY_LINK3)
|
||||
AC_SUBST(PROGRAM_EXT)
|
||||
|
||||
dnl global gl options
|
||||
AC_SUBST(WX_LIBRARY_NAME_GL)
|
||||
AC_SUBST(WX_LIBRARY_NAME_STATIC_GL)
|
||||
AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
|
||||
AC_SUBST(WX_LIBRARY_GL)
|
||||
AC_SUBST(WX_TARGET_LIBRARY_GL)
|
||||
AC_SUBST(WX_LIBRARY_LINK1_GL)
|
||||
AC_SUBST(WX_LIBRARY_LINK2_GL)
|
||||
AC_SUBST(WX_LIBRARY_LINK3_GL)
|
||||
|
||||
dnl are we supposed to create the links?
|
||||
AC_SUBST(WX_ALL)
|
||||
AC_SUBST(WX_ALL_INSTALLED)
|
||||
@@ -3494,6 +3465,7 @@ AC_SUBST(PIC_FLAG)
|
||||
AC_SUBST(DEP_INFO_FLAGS)
|
||||
AC_SUBST(CODE_GEN_FLAGS)
|
||||
AC_SUBST(BURNT_LIBRARY_NAME)
|
||||
AC_SUBST(BURNT_LIBRARY_NAME_GL)
|
||||
|
||||
dnl debugging options
|
||||
AC_SUBST(WXDEBUG_DEFINE)
|
||||
@@ -3562,22 +3534,7 @@ AC_CONFIG_HEADER(setup.h:setup.h.in)
|
||||
|
||||
dnl some more GUI only things
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
AC_CACHE_CHECK([glcanvas subdirectory to use], wx_cv_path_glcanvas,
|
||||
[
|
||||
dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some
|
||||
dnl genius called it "win"
|
||||
if test "${TOOLKIT_DIR}" = "msw" ; then
|
||||
wx_cv_path_glcanvas="win"
|
||||
else
|
||||
wx_cv_path_glcanvas="${TOOLKIT_DIR}"
|
||||
fi
|
||||
])
|
||||
|
||||
dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
|
||||
GL_TOOLKIT_DIR=$wx_cv_path_glcanvas
|
||||
AC_SUBST(GL_TOOLKIT_DIR)
|
||||
|
||||
dnl another hack: we need to pass SAMPLES_SUBDIRS to the configure in
|
||||
dnl we need to pass SAMPLES_SUBDIRS to the configure in
|
||||
dnl samples and the only way to do it is, again, use the cache
|
||||
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
|
||||
AC_CONFIG_SUBDIRS(demos samples utils)
|
||||
|
||||
@@ -47,6 +47,8 @@
|
||||
$wxOS2PM{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "H" ) {
|
||||
$wxHTML{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "J" ) {
|
||||
$wxOGL{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "U" ) {
|
||||
$wxUNIX{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "B" ) {
|
||||
@@ -57,6 +59,8 @@
|
||||
$wxPROTOCOLINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "L" ) {
|
||||
$wxHTMLINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "Z" ) {
|
||||
$wxOGLINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "F" ) {
|
||||
$wxMOTIFINCLUDE{$fields[0]} = $fields[2];
|
||||
} elsif ( $fields[1] eq "9" ) {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
# R /src/gtk R for Robert
|
||||
# O /src/os2
|
||||
# H /src/html
|
||||
# J /src/ogl
|
||||
# W /include/wx
|
||||
# K /include/wx/gtk K for gtK
|
||||
# F /include/wx/motif F for motiF
|
||||
@@ -23,6 +24,7 @@
|
||||
# 2 /include/wx/os2 2 for os2
|
||||
# N /include/wx/generic N for geNeric
|
||||
# L /include/wx/html L for htmL
|
||||
# Z /include/wx/ogl
|
||||
# P /include/wx/protocol
|
||||
# S /include/wx/unix S for poSix
|
||||
#
|
||||
@@ -346,7 +348,6 @@ fontdlg.cpp R
|
||||
frame.cpp R
|
||||
gauge.cpp R
|
||||
gdiobj.cpp R
|
||||
glcanvas.cpp R
|
||||
icon.cpp R
|
||||
listbox.cpp R
|
||||
main.cpp R
|
||||
@@ -531,6 +532,19 @@ m_tables.cpp H
|
||||
m_meta.cpp H
|
||||
htmprint.cpp H
|
||||
|
||||
basic.cpp J
|
||||
basic2.cpp J
|
||||
bmpshape.cpp J
|
||||
canvas.cpp J
|
||||
composit.cpp J
|
||||
constrnt.cpp J
|
||||
divided.cpp J
|
||||
drawn.cpp J
|
||||
lines.cpp J
|
||||
mfutils.cpp J
|
||||
oglmisc.cpp J
|
||||
ogldiag.cpp J
|
||||
|
||||
arrimpl.cpp W B
|
||||
listimpl.cpp W B
|
||||
accel.h W
|
||||
@@ -1073,6 +1087,22 @@ winpars.h L
|
||||
m_templ.h L
|
||||
htmprint.h L
|
||||
|
||||
basic.h Z
|
||||
basicp.h Z
|
||||
bmpshape.h Z
|
||||
canvas.h Z
|
||||
composit.h Z
|
||||
constrnt.h Z
|
||||
divided.h Z
|
||||
drawn.h Z
|
||||
drawnp.h Z
|
||||
lines.h Z
|
||||
linesp.h Z
|
||||
mfutils.h Z
|
||||
misc.h Z
|
||||
ogl.h Z
|
||||
ogldiag.h Z
|
||||
|
||||
calctrl.h N
|
||||
caret.h N
|
||||
choicdgg.h N
|
||||
|
||||
@@ -64,6 +64,16 @@
|
||||
$project{"HTMLOBJS"} .= $fileobj . " ";
|
||||
$project{"HTMLDEPS"} .= $filedep . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxOGL) {
|
||||
($fileobj = $file) =~ s/cp?p?$/\o/;
|
||||
($filedep = $file) =~ s/cp?p?$/\d/;
|
||||
|
||||
$project{"GTK_SOURCES"} .= "ogl/" . $file . " ";
|
||||
$project{"OGLOBJS"} .= $fileobj . " ";
|
||||
$project{"OGLDEPS"} .= $filedep . " "
|
||||
}
|
||||
|
||||
#! find all our headers
|
||||
foreach $file (sort keys %wxWXINCLUDE) {
|
||||
$project{"GTK_HEADERS"} .= $file . " "
|
||||
@@ -85,6 +95,10 @@
|
||||
$project{"GTK_HEADERS"} .= "html/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxOGLINCLUDE) {
|
||||
$project{"GTK_HEADERS"} .= "ogl/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxPROTOCOLINCLUDE) {
|
||||
$project{"GTK_HEADERS"} .= "protocol/" . $file . " "
|
||||
}
|
||||
@@ -127,3 +141,9 @@ HTMLOBJS = \
|
||||
HTMLDEPS = \
|
||||
#$ ExpandList("HTMLDEPS");
|
||||
|
||||
OGLOBJS = \
|
||||
#$ ExpandList("OGLOBJS");
|
||||
|
||||
OGLDEPS = \
|
||||
#$ ExpandList("OGLDEPS");
|
||||
|
||||
|
||||
@@ -154,6 +154,7 @@
|
||||
* Use OpenGL
|
||||
*/
|
||||
#define wxUSE_OPENGL 0
|
||||
#define wxUSE_GLCANVAS 0
|
||||
|
||||
/*
|
||||
* Use GUI
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 18:32, 2000/02/17
|
||||
# This file was automatically generated by tmake at 20:56, 2000/03/01
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
|
||||
ALL_SOURCES = \
|
||||
generic/busyinfo.cpp \
|
||||
@@ -37,6 +37,7 @@ ALL_SOURCES = \
|
||||
generic/textdlgg.cpp \
|
||||
generic/tipdlg.cpp \
|
||||
generic/treectrl.cpp \
|
||||
generic/treelay.cpp \
|
||||
generic/wizard.cpp \
|
||||
common/appcmn.cpp \
|
||||
common/choiccmn.cpp \
|
||||
@@ -221,7 +222,19 @@ ALL_SOURCES = \
|
||||
html/m_meta.cpp \
|
||||
html/m_pre.cpp \
|
||||
html/m_tables.cpp \
|
||||
html/winpars.cpp
|
||||
html/winpars.cpp \
|
||||
ogl/basic.cpp \
|
||||
ogl/basic2.cpp \
|
||||
ogl/bmpshape.cpp \
|
||||
ogl/canvas.cpp \
|
||||
ogl/composit.cpp \
|
||||
ogl/constrnt.cpp \
|
||||
ogl/divided.cpp \
|
||||
ogl/drawn.cpp \
|
||||
ogl/lines.cpp \
|
||||
ogl/mfutils.cpp \
|
||||
ogl/ogldiag.cpp \
|
||||
ogl/oglmisc.cpp
|
||||
|
||||
ALL_HEADERS = \
|
||||
accel.h \
|
||||
@@ -299,6 +312,7 @@ ALL_HEADERS = \
|
||||
gdiobj.h \
|
||||
geometry.h \
|
||||
gifdecod.h \
|
||||
glcanvas.h \
|
||||
grid.h \
|
||||
gsocket.h \
|
||||
hash.h \
|
||||
@@ -457,6 +471,7 @@ ALL_HEADERS = \
|
||||
gtk/frame.h \
|
||||
gtk/gauge.h \
|
||||
gtk/gdiobj.h \
|
||||
gtk/glcanvas.h \
|
||||
gtk/icon.h \
|
||||
gtk/joystick.h \
|
||||
gtk/listbox.h \
|
||||
@@ -493,6 +508,7 @@ ALL_HEADERS = \
|
||||
generic/colrdlgg.h \
|
||||
generic/dcpsg.h \
|
||||
generic/dirdlgg.h \
|
||||
generic/dragimgg.h \
|
||||
generic/filedlgg.h \
|
||||
generic/fontdlgg.h \
|
||||
generic/grid.h \
|
||||
@@ -536,6 +552,21 @@ ALL_HEADERS = \
|
||||
html/htmprint.h \
|
||||
html/m_templ.h \
|
||||
html/winpars.h \
|
||||
ogl/basic.h \
|
||||
ogl/basicp.h \
|
||||
ogl/bmpshape.h \
|
||||
ogl/canvas.h \
|
||||
ogl/composit.h \
|
||||
ogl/constrnt.h \
|
||||
ogl/divided.h \
|
||||
ogl/drawn.h \
|
||||
ogl/drawnp.h \
|
||||
ogl/lines.h \
|
||||
ogl/linesp.h \
|
||||
ogl/mfutils.h \
|
||||
ogl/misc.h \
|
||||
ogl/ogl.h \
|
||||
ogl/ogldiag.h \
|
||||
protocol/file.h \
|
||||
protocol/ftp.h \
|
||||
protocol/http.h \
|
||||
@@ -749,9 +780,9 @@ GENERICOBJS = \
|
||||
caret.o \
|
||||
choicdgg.o \
|
||||
colrdlgg.o \
|
||||
dragimgg.o \
|
||||
dcpsg.o \
|
||||
dirdlgg.o \
|
||||
dragimgg.o \
|
||||
filedlgg.o \
|
||||
grid.o \
|
||||
helpext.o \
|
||||
@@ -780,6 +811,7 @@ GENERICOBJS = \
|
||||
textdlgg.o \
|
||||
tipdlg.o \
|
||||
treectrl.o \
|
||||
treelay.o \
|
||||
wizard.o
|
||||
|
||||
GENERICDEPS = \
|
||||
@@ -819,6 +851,7 @@ GENERICDEPS = \
|
||||
textdlgg.d \
|
||||
tipdlg.d \
|
||||
treectrl.d \
|
||||
treelay.d \
|
||||
wizard.d
|
||||
|
||||
GUIOBJS = \
|
||||
@@ -1005,3 +1038,31 @@ HTMLDEPS = \
|
||||
m_tables.d \
|
||||
winpars.d
|
||||
|
||||
OGLOBJS = \
|
||||
basic.o \
|
||||
basic2.o \
|
||||
bmpshape.o \
|
||||
canvas.o \
|
||||
composit.o \
|
||||
constrnt.o \
|
||||
divided.o \
|
||||
drawn.o \
|
||||
lines.o \
|
||||
mfutils.o \
|
||||
ogldiag.o \
|
||||
oglmisc.o
|
||||
|
||||
OGLDEPS = \
|
||||
basic.d \
|
||||
basic2.d \
|
||||
bmpshape.d \
|
||||
canvas.d \
|
||||
composit.d \
|
||||
constrnt.d \
|
||||
divided.d \
|
||||
drawn.d \
|
||||
lines.d \
|
||||
mfutils.d \
|
||||
ogldiag.d \
|
||||
oglmisc.d
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 18:32, 2000/02/17
|
||||
# This file was automatically generated by tmake at 20:56, 2000/03/01
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
|
||||
ALL_SOURCES = \
|
||||
generic/busyinfo.cpp \
|
||||
@@ -37,6 +37,7 @@ ALL_SOURCES = \
|
||||
generic/textdlgg.cpp \
|
||||
generic/tipdlg.cpp \
|
||||
generic/treectrl.cpp \
|
||||
generic/treelay.cpp \
|
||||
generic/wizard.cpp \
|
||||
common/appcmn.cpp \
|
||||
common/choiccmn.cpp \
|
||||
@@ -221,7 +222,19 @@ ALL_SOURCES = \
|
||||
html/m_meta.cpp \
|
||||
html/m_pre.cpp \
|
||||
html/m_tables.cpp \
|
||||
html/winpars.cpp
|
||||
html/winpars.cpp \
|
||||
ogl/basic.cpp \
|
||||
ogl/basic2.cpp \
|
||||
ogl/bmpshape.cpp \
|
||||
ogl/canvas.cpp \
|
||||
ogl/composit.cpp \
|
||||
ogl/constrnt.cpp \
|
||||
ogl/divided.cpp \
|
||||
ogl/drawn.cpp \
|
||||
ogl/lines.cpp \
|
||||
ogl/mfutils.cpp \
|
||||
ogl/ogldiag.cpp \
|
||||
ogl/oglmisc.cpp
|
||||
|
||||
ALL_HEADERS = \
|
||||
accel.h \
|
||||
@@ -299,6 +312,7 @@ ALL_HEADERS = \
|
||||
gdiobj.h \
|
||||
geometry.h \
|
||||
gifdecod.h \
|
||||
glcanvas.h \
|
||||
grid.h \
|
||||
gsocket.h \
|
||||
hash.h \
|
||||
@@ -457,6 +471,7 @@ ALL_HEADERS = \
|
||||
gtk/frame.h \
|
||||
gtk/gauge.h \
|
||||
gtk/gdiobj.h \
|
||||
gtk/glcanvas.h \
|
||||
gtk/icon.h \
|
||||
gtk/joystick.h \
|
||||
gtk/listbox.h \
|
||||
@@ -493,6 +508,7 @@ ALL_HEADERS = \
|
||||
generic/colrdlgg.h \
|
||||
generic/dcpsg.h \
|
||||
generic/dirdlgg.h \
|
||||
generic/dragimgg.h \
|
||||
generic/filedlgg.h \
|
||||
generic/fontdlgg.h \
|
||||
generic/grid.h \
|
||||
@@ -536,6 +552,21 @@ ALL_HEADERS = \
|
||||
html/htmprint.h \
|
||||
html/m_templ.h \
|
||||
html/winpars.h \
|
||||
ogl/basic.h \
|
||||
ogl/basicp.h \
|
||||
ogl/bmpshape.h \
|
||||
ogl/canvas.h \
|
||||
ogl/composit.h \
|
||||
ogl/constrnt.h \
|
||||
ogl/divided.h \
|
||||
ogl/drawn.h \
|
||||
ogl/drawnp.h \
|
||||
ogl/lines.h \
|
||||
ogl/linesp.h \
|
||||
ogl/mfutils.h \
|
||||
ogl/misc.h \
|
||||
ogl/ogl.h \
|
||||
ogl/ogldiag.h \
|
||||
protocol/file.h \
|
||||
protocol/ftp.h \
|
||||
protocol/http.h \
|
||||
@@ -749,9 +780,9 @@ GENERICOBJS = \
|
||||
caret.o \
|
||||
choicdgg.o \
|
||||
colrdlgg.o \
|
||||
dragimgg.o \
|
||||
dcpsg.o \
|
||||
dirdlgg.o \
|
||||
dragimgg.o \
|
||||
filedlgg.o \
|
||||
grid.o \
|
||||
helpext.o \
|
||||
@@ -780,6 +811,7 @@ GENERICOBJS = \
|
||||
textdlgg.o \
|
||||
tipdlg.o \
|
||||
treectrl.o \
|
||||
treelay.o \
|
||||
wizard.o
|
||||
|
||||
GENERICDEPS = \
|
||||
@@ -819,6 +851,7 @@ GENERICDEPS = \
|
||||
textdlgg.d \
|
||||
tipdlg.d \
|
||||
treectrl.d \
|
||||
treelay.d \
|
||||
wizard.d
|
||||
|
||||
GUIOBJS = \
|
||||
@@ -1005,3 +1038,31 @@ HTMLDEPS = \
|
||||
m_tables.d \
|
||||
winpars.d
|
||||
|
||||
OGLOBJS = \
|
||||
basic.o \
|
||||
basic2.o \
|
||||
bmpshape.o \
|
||||
canvas.o \
|
||||
composit.o \
|
||||
constrnt.o \
|
||||
divided.o \
|
||||
drawn.o \
|
||||
lines.o \
|
||||
mfutils.o \
|
||||
ogldiag.o \
|
||||
oglmisc.o
|
||||
|
||||
OGLDEPS = \
|
||||
basic.d \
|
||||
basic2.d \
|
||||
bmpshape.d \
|
||||
canvas.d \
|
||||
composit.d \
|
||||
constrnt.d \
|
||||
divided.d \
|
||||
drawn.d \
|
||||
lines.d \
|
||||
mfutils.d \
|
||||
ogldiag.d \
|
||||
oglmisc.d
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ include $(top_builddir)/src/make.env
|
||||
all: $(BIN_PROGRAM) install_dirs install_data
|
||||
|
||||
$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
|
||||
$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
|
||||
$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES)
|
||||
|
||||
install_dirs:
|
||||
@list='$(DATADIRS)'; for p in $$list; do \
|
||||
|
||||
@@ -9,8 +9,6 @@ all:
|
||||
cd HelpGen; make
|
||||
cd dialoged; make
|
||||
cd wxMMedia2; make
|
||||
cd glcanvas; make
|
||||
cd ogl; make
|
||||
|
||||
clean:
|
||||
cd tex2rtf; make clean
|
||||
@@ -19,6 +17,4 @@ clean:
|
||||
cd HelpGen; make clean
|
||||
cd dialoged; make clean
|
||||
cd wxMMedia2; make clean
|
||||
cd glcanvas; make clean
|
||||
cd ogl; make clean
|
||||
|
||||
|
||||
16
utils/configure
vendored
16
utils/configure
vendored
@@ -1,8 +1,8 @@
|
||||
#! /bin/sh
|
||||
|
||||
# From configure.in Id
|
||||
# From configure.in Id: configure.in
|
||||
# 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.
|
||||
#
|
||||
# This configure script is free software; the Free Software Foundation
|
||||
@@ -334,7 +334,7 @@ EOF
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
echo "configure generated by autoconf version 2.13"
|
||||
echo "configure generated by autoconf version 2.14"
|
||||
exit 0 ;;
|
||||
|
||||
-with-* | --with-*)
|
||||
@@ -628,7 +628,7 @@ do
|
||||
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 ;;
|
||||
-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 ;;
|
||||
-help | --help | --hel | --he | --h)
|
||||
echo "\$ac_cs_usage"; exit 0 ;;
|
||||
@@ -643,10 +643,6 @@ trap 'rm -fr `echo "
|
||||
wxMMedia2/Makefile
|
||||
wxMMedia2/lib/Makefile
|
||||
wxMMedia2/sample/Makefile
|
||||
glcanvas/Makefile
|
||||
glcanvas/${GL_TOOLKIT_DIR}/Makefile
|
||||
ogl/Makefile
|
||||
ogl/src/Makefile
|
||||
makegen/Makefile
|
||||
HelpGen/Makefile
|
||||
HelpGen/src/Makefile
|
||||
@@ -733,10 +729,6 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
|
||||
wxMMedia2/Makefile
|
||||
wxMMedia2/lib/Makefile
|
||||
wxMMedia2/sample/Makefile
|
||||
glcanvas/Makefile
|
||||
glcanvas/${GL_TOOLKIT_DIR}/Makefile
|
||||
ogl/Makefile
|
||||
ogl/src/Makefile
|
||||
makegen/Makefile
|
||||
HelpGen/Makefile
|
||||
HelpGen/src/Makefile
|
||||
|
||||
@@ -11,10 +11,6 @@ AC_OUTPUT([
|
||||
wxMMedia2/Makefile
|
||||
wxMMedia2/lib/Makefile
|
||||
wxMMedia2/sample/Makefile
|
||||
glcanvas/Makefile
|
||||
glcanvas/${GL_TOOLKIT_DIR}/Makefile
|
||||
ogl/Makefile
|
||||
ogl/src/Makefile
|
||||
makegen/Makefile
|
||||
HelpGen/Makefile
|
||||
HelpGen/src/Makefile
|
||||
|
||||
Reference in New Issue
Block a user