AC_DEFINE(STRICT)
AC_DEFINE(WINVER, 0x0400)
PROGRAM_EXT=".exe"
+ RESCOMP=windres
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
DEFAULT_DEFAULT_wxUSE_PM=1
;;
- *-*-darwin* )
+ powerpc-*-darwin* )
+ dnl PowerPC Darwin based distributions (including Mac OS X)
USE_BSD=1
USE_DARWIN=1
SO_SUFFIX=dylib
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
+ AC_DEFINE(__POWERPC__)
DEFAULT_DEFAULT_wxUSE_MAC=1
;;
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
+ DEFAULT_wxUSE_PRECOMP=yes
DEFAULT_wxUSE_APPLE_IEEE=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
+ DEFAULT_wxUSE_PRECOMP=yes
DEFAULT_wxUSE_APPLE_IEEE=yes
DEFAULT_wxUSE_LOG=yes
WX_ARG_SYS_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 ====================
-dnl compile-time options
-dnl ====================
-
dnl ---------------------------------------------------------------------------
dnl compile options
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE)
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
+dnl allow the precompiled header option to be disabled under Mac OS X
+WX_ARG_ENABLE(precomp, [ --enable-precomp enable use of precompiled headers (Mac OS X)], wxUSE_PRECOMP)
+
if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
dnl --- some of them should probably be included conditionally.
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+ dnl Cygwin doesn't link these by default
+ if test "$wxUSE_CYGWIN" = 1; then
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+ fi
+
dnl add extra odbc libs if we have compiled in odbc
if test "$wxUSE_ODBC" = "yes" ; then
LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
fi
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11"
- TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+ TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
fi
- dnl we can't call this MAC_DIST or autoconf thinks its a macro
if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_PRECOMP" = "yes"; then
+ CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+ fi
+ CFLAGS="${CFLAGS} -fpascal-strings"
+ CXXFLAGS="${CXXFLAGS} -fpascal-strings"
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
+
TOOLKIT=MAC
+ dnl we can't call this MAC_DIST or autoconf thinks its a macro
GUIDIST=MACX_DIST
fi
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-dnl the name of the resources file for wxMAC
-WX_RESOURCES_DARWIN="lib${WX_LIBRARY}.rsrc"
+dnl the name of the resources file for wxMac
+WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
PIC_FLAG="+Z"
fi
+ dnl install shared libs without symlinks
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="preinstall_gl"
+ WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
+ else
+ WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+ fi
;;
*-*-linux* )
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
+ SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
+ SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
fi
;;
*-*-darwin* )
- dnl FIXME: do we need __UNIX__ here? It's already defined above
- dnl for darwin right??
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
- CPPFLAGS="${CPPFLAGS} -fno-common"
+ CFLAGS="${CFLAGS} -fno-common"
+ CXXFLAGS="${CXXFLAGS} -fno-common"
SHARED_LD="${CXX} -dynamiclib -o"
PIC_FLAG="-dynamic -fPIC"
-
- dnl add the resources target for wxMac
- if test "$wxUSE_MAC" = 1 ; then
- WX_ALL="${WX_ALL} lib${WX_LIBRARY}.r"
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
- CPPFLAGS="${CPPFLAGS} -fpascal-strings"
- CXXFLAGS="${CXXFLAGS} -cpp-precomp"
- AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
- AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
- LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
- LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
- fi
;;
*-*-aix* )
SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
;;
- *-*-cygwin* )
- dnl only static for now
- AC_MSG_WARN(Shared libs unsupported for $host_alias -- forcing static build.)
- wxUSE_SHARED=no
- ;;
-
- *-*-mingw32* )
+ *-*-cygwin* | *-*-mingw32* )
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
- WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
+
+ dnl install shared libs without symlinks
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
else
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
fi
+ dnl -fPIC is not required for mingw build -- all code is already
+ dnl position independent
+ PIC_FLAG=
;;
*-pc-os2_emx )
dnl only static for now
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+ wxUSE_SHARED=no
;;
*-*-beos* )
;;
*)
- AC_MSG_ERROR(unknown system type ${host}.)
+ AC_MSG_ERROR(unknown system type $host.)
esac
dnl set target to shared if not explicitly chose static before
WX_TARGET_LIBRARY_TYPE="a"
fi
+if test "$wxUSE_MAC" = 1; then
+ dnl add the resources target for wxMac
+ WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+ AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+ AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+ LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
+ LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+fi
+
dnl ------------------------------------------------------------------------
dnl Check for headers
dnl ------------------------------------------------------------------------
AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
AC_TRY_COMPILE(
[
- #include <sys/vfs.h>
+ #ifdef __DARWIN__
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
+ #include <sys/vfs.h>
+ #endif
],
[
long l;
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
if test "$wxUSE_NO_DEPS" = "no" ; then
CFLAGS="-MMD ${CFLAGS}"
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
- AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
+ wxUSE_MDI_ARCHITECTURE=no
+ fi
+
+ if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+ AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+ fi
fi
if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
AC_DEFINE(wxUSE_MS_HTML_HELP)
],
[
- AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h, disabled])
+ AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
wxUSE_MS_HTML_HELP=no
])
fi
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
- AC_MSG_WARN([Toggle button is not yet supported under Mac OS X])
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
wxUSE_TOGGLEBTN=no
fi
drawing dynamic erase event exec font image \
minimal richedit rotate widgets"
- if test "$wxUSE_UNIVERSAL" = "yes" ; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
- fi
-
dnl this is needed to be able to find AFM files
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
else
AC_SUBST(RESCOMP)
AC_SUBST(RESFLAGS)
AC_SUBST(RESPROGRAMOBJ)
-AC_SUBST(WX_RESOURCES_DARWIN)
+AC_SUBST(WX_RESOURCES_MACOSX)
dnl additional for Mac OS X
AC_SUBST(DEREZ)
projects / wxWidgets.git / blobdiff