AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__)
+ AC_DEFINE(STRICT)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__)
+ AC_DEFINE(STRICT)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
+ DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
DEFAULT_wxUSE_DEBUG_GDB=yes
DEFAULT_wxUSE_ZLIB=no
DEFAULT_wxUSE_LIBPNG=no
- DEFAULT_wxUSE_LIBGIF=no
DEFAULT_wxUSE_LIBJPEG=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+
+ DEFAULT_wxUSE_GIF=no
+ DEFAULT_wxUSE_PCX=no
+ DEFAULT_wxUSE_PNM=no
else
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
+ DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_NO_EXCEPTIONS=no
+ DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
DEFAULT_wxUSE_DEBUG_GDB=no
DEFAULT_wxUSE_ZLIB=yes
DEFAULT_wxUSE_LIBPNG=yes
- DEFAULT_wxUSE_LIBGIF=yes
DEFAULT_wxUSE_LIBJPEG=yes
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+
+ DEFAULT_wxUSE_GIF=yes
+ DEFAULT_wxUSE_PCX=yes
+ DEFAULT_wxUSE_PNM=yes
fi
dnl WX_ARG_WITH should be used to select whether an external package will be
WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
WX_ARG_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
WX_ARG_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
-WX_ARG_WITH(libgif, [ --with-libgif use libgif (GIF file format)], wxUSE_LIBGIF)
WX_ARG_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE)
WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI)
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exceptions information], wxUSE_NO_EXCEPTIONS)
+WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
+WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
dnl ---------------------------------------------------------------------------
dnl --disable-gui will build only non-GUI part of wxWindows
WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
+dnl ---------------------------------------------------------------------------
+dnl support for image formats that do not rely on external library
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(gif, [ --enable-gif use gif images (GIF file format)], wxUSE_GIF)
+WX_ARG_ENABLE(pcx, [ --enable-pcx use pcx images (PCX file format)], wxUSE_PCX)
+WX_ARG_ENABLE(pnm, [ --enable-pnm use pnm images (PNM file format)], wxUSE_PNM)
+
dnl cache the options values before (may be) aborting below
WX_ARG_CACHE_FLUSH
dnl different from the target one (assume host and target be always the same)
if eval "test $host != $build"; then
if eval "test $host_alias != NONE"; then
- CC=$host_alias-gcc
- CXX=$host_alias-c++
+ CC=$host_alias-gcc
+ CXX=$host_alias-c++
AR=$host_alias-ar
RANLIB=$host_alias-ranlib
- DLLTOOL=$host_alias-dlltool
- LD=$host_alias-ld
+ DLLTOOL=$host_alias-dlltool
+ LD=$host_alias-ld
NM=$host_alias-nm
STRIP=$host_alias-strip
fi
\
/usr/include/Motif1.2 \
/opt/xpm/include/X11 \
+ /opt/GBxpm/include/ \
+ /opt/GBxpm/X11/include/ \
\
/usr/Motif1.2/include \
/usr/dt/include \
WXWINE=
-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
- AC_MSG_CHECKING(for Windows headers)
- WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-
- dnl --- Quick & Dirty ; link against most/all libraries
- dnl --- This will bloat the executable, but it'll work for now...
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+dnl Extension for programs; '.exe' for msw builds
+PROGRAM_EXT=
- if test "$ac_find_includes" != "" ; then
- AC_MSG_RESULT(found $ac_find_includes)
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+ if test "$cross_compiling" = "yes" ; then
+ AC_MSG_WARN(Cross compiling --- skipping windows.h check)
else
- AC_MSG_RESULT(no)
- if test "$cross_compiling" != "yes" ; then
+ AC_MSG_CHECKING(for Windows headers)
+ WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found $ac_find_includes)
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+ else
+ AC_MSG_RESULT(no)
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
- fi
+ fi
fi
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+ dnl --- Quick & Dirty ; link against most/all libraries
+ dnl --- This will bloat the executable, but it'll work for now...
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+
TOOLKIT=MSW
-
+
GUIOBJS=MSW_GUIOBJS
GUIHEADERS=MSW_HEADERS
COMMONOBJS=MSW_COMMONOBJS
GENERICOBJS=MSW_GENERICOBJS
UNIXOBJS=
GUIDIST=MSW_DIST
+ PROGRAM_EXT=.exe
fi
if test "$wxUSE_GTK" = 1; then
TOOLKIT_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS -ldl"
TOOLKIT=GTK
-
- GUIOBJS=GTK_GUIOBJS
+
GUIHEADERS=GTK_HEADERS
+ GUIOBJS=GTK_GUIOBJS
COMMONOBJS=GTK_COMMONOBJS
GENERICOBJS=GTK_GENERICOBJS
+ GUIDEPS=GTK_GUIDEPS
+ COMMONDEPS=GTK_COMMONDEPS
+ GENERICDEPS=GTK_GENERICDEPS
UNIXOBJS=UNIXOBJS
GUIDIST=GTK_DIST
fi
AC_MSG_RESULT(no)
AC_MSG_WARN(library will be compiled without support for images in XPM format)
fi
-
+
MESA_LINK=""
AC_MSG_CHECKING(for Mesa library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
WXWINE=1
TOOLKIT=MSW
-
- GUIOBJS=MSW_GUIOBJS
+
GUIHEADERS=MSW_HEADERS
+ GUIOBJS=MSW_GUIOBJS
COMMONOBJS=MSW_COMMONOBJS
GENERICOBJS=MSW_GENERICOBJS
+ GUIDEPS=MSW_GUIDEPS
+ COMMONDEPS=MSW_COMMONDEPS
+ GENERICDEPS=MSW_GENERICDEPS
UNIXOBJS=UNIXOBJS
GUIDIST=MSW_DIST
fi
GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF
-
- GUIOBJS=MOTIF_GUIOBJS
+
GUIHEADERS=MOTIF_HEADERS
+ GUIOBJS=MOTIF_GUIOBJS
COMMONOBJS=MOTIF_COMMONOBJS
GENERICOBJS=MOTIF_GENERICOBJS
+ GUIDEPS=MOTIF_GUIDEPS
+ COMMONDEPS=MOTIF_COMMONDEPS
+ GENERICDEPS=MOTIF_GENERICDEPS
UNIXOBJS=UNIXOBJS
GUIDIST=MOTIF_DIST
fi
WX_CREATE_LINKS="CREATE_LINKS"
;;
*-*-irix5* | *-*-irix6* )
- SHARED_LD="${CXX} -shared -o"
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -shared -o"
+ fi
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
;;
*-*-solaris2* )
- SHARED_LD="${CXX} -G -o"
- PIC_FLAG="PIC"
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -G -o"
+ PIC_FLAG="PIC"
+ fi
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
;;
*-*-sunos4* )
- SHARED_LD="${CXX} -shared -o"
+ SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
;;
*-*-freebsd* | *-*-netbsd*)
- SHARED_LD="${CXX} -shared -o"
+ SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
;;
*-*-sysv5* )
- SHARED_LD="${CXX} -shared -o"
+ SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS"
WX_CREATE_LINKS="CREATE_LINKS"
if test "$wxUSE_THREADS" = "yes" ; then
dnl find if POSIX threads are available
-
+
dnl standard lib name is pthread
dnl We no longer test for pthread-0.7 as it breaks compilation on some
dnl glibc2 systems, especially for static linkage.
fi
WXDEBUG=
-if test "$wxUSE_DEBUG_GDB" = "yes" ; then
- wxUSE_DEBUG_INFO=yes
- WXDEBUG="-ggdb"
-fi
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
WXDEBUG="-g"
wxUSE_OPTIMISE=no
fi
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+ wxUSE_DEBUG_INFO=yes
+ WXDEBUG="-ggdb"
+fi
+
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
AC_DEFINE(WXDEBUG)
WXDEBUG_DEFINE="-D__WXDEBUG__"
PROFILE="-pg"
fi
+DEP_INFO_FLAGS=
if test "$GCC" = yes ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
fi
-fi
-
-
+ if test "$wxUSE_PERMISSIVE" = "yes" ; then
+ CFLAGS="${CFLAGS} -fpermissive"
+ CXXFLAGS="${CXXFLAGS} -fpermissive"
+ fi
+ if test "$wxUSE_NO_DEPS" = "no" ; then
+ DEP_INFO_FLAGS="-MMD"
+ fi
+fi
+
+
CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
if test "$wxUSE_OPTIMISE" = "no" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
fi
-if test "$wxUSE_LIBGIF" = "yes" ; then
- AC_DEFINE(wxUSE_LIBGIF)
-fi
-
JPEG_INCLUDE=
if test "$wxUSE_LIBJPEG" = "yes" ; then
AC_DEFINE(wxUSE_LIBJPEG)
[AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
if test "$HAVE_DL_FUNCS" = 0; then
- if test "$USE_UNIX" = 1; then
+ if test "$USE_UNIX" = 1; then
AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
wxUSE_ODBC=no
wxUSE_DYNLIB_CLASS=no
else
AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
- fi
+ fi
fi
fi
if test "$wxUSE_WINE" = 1 ; then
AC_MSG_WARN([wxStaticLine is not supported under WINE])
else
- if test "$wxUSE_MOTIF" = 1 ; then
- AC_MSG_WARN([wxStaticLine is not supported under Motif])
- else
- AC_DEFINE(wxUSE_STATLINE)
- fi
+ AC_DEFINE(wxUSE_STATLINE)
fi
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
fi
+if test "$wxUSE_GIF" = "yes" ; then
+ AC_DEFINE(wxUSE_GIF)
+fi
+
+if test "$wxUSE_PCX" = "yes" ; then
+ AC_DEFINE(wxUSE_PCX)
+fi
+
+if test "$wxUSE_PNM" = "yes" ; then
+ AC_DEFINE(wxUSE_PNM)
+fi
+
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
AC_SUBST(WX_LIBRARY_LINK1)
AC_SUBST(WX_LIBRARY_LINK2)
AC_SUBST(WX_LIBRARY_LINK3)
+AC_SUBST(PROGRAM_EXT)
dnl are we supposed to create the links?
AC_SUBST(WX_CREATE_LINKS)
AC_SUBST(SHARED_LD)
AC_SUBST(PIC_FLAG)
+AC_SUBST(DEP_INFO_FLAGS)
dnl debugging options
AC_SUBST(WXDEBUG_DEFINE)
AC_SUBST(TOOLKIT_INCLUDE)
dnl what to compile
-AC_SUBST(GUIOBJS)
AC_SUBST(GUIHEADERS)
+AC_SUBST(GUIOBJS)
AC_SUBST(COMMONOBJS)
AC_SUBST(GENERICOBJS)
+AC_SUBST(GUIDEPS)
+AC_SUBST(COMMONDEPS)
+AC_SUBST(GENERICDEPS)
AC_SUBST(UNIXOBJS)
AC_SUBST(GUIDIST)
AC_CONFIG_HEADER(setup.h:setup.h.in)
+dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some
+dnl genius called it "win"
+if test "${TOOLKIT_DIR}" = "msw" ; then
+ GL_TOOLKIT_DIR="win"
+else
+ GL_TOOLKIT_DIR="${TOOLKIT_DIR}"
+fi
+dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
+AC_SUBST(GL_TOOLKIT_DIR)
dnl create each of the files in the space separated list from the file.in
dnl (the original file name may be overriden by appending another name after a
samples/drawing/Makefile
samples/dynamic/Makefile
samples/image/Makefile
+ samples/internat/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/validate/Makefile
samples/wxpoem/Makefile
samples/wxsocket/Makefile
+ samples/wizard/Makefile
samples/html/Makefile
samples/html/about/Makefile
samples/html/help/Makefile
utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile
+ utils/glcanvas/Makefile
+ utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
+ utils/ogl/Makefile
+ utils/ogl/src/Makefile
],
[
chmod +x wx-config
- if test ! -d include; then
- mkdir include
+ if test ! -d include; then
+ mkdir include
fi
- if test ! -d include/wx; then
- mkdir include/wx
+ if test ! -d include/wx; then
+ mkdir include/wx
fi
- if test ! -d include/wx/${TOOLKIT_DIR}; then
- mkdir include/wx/${TOOLKIT_DIR}
+ if test ! -d include/wx/${TOOLKIT_DIR}; then
+ mkdir include/wx/${TOOLKIT_DIR}
fi
cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
],
projects / wxWidgets.git / blobdiff