* make install now installs OLE headers on cygwin
* cygwin now uses the same naming conventions for libraries as the rest of wxMSW * updated filelist.txt * added code to filelist.t fo parse OLE headers * all platforms using configure now have --enable-no_rtti, --enable-no_exceptions on by default git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
parent
3fe03e474d
commit
f676c7ffd5
@ -411,6 +411,10 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
|
||||
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
|
||||
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
|
||||
$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
||||
@# this installs the import library for a MSW DLL
|
||||
@# remember: for wxMSW DLL WX_LIBRARY_NAME_STATIC is the
|
||||
@# import livraru name
|
||||
@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
|
||||
|
||||
$(INSTALL) -d $(libdir)/wx
|
||||
$(INSTALL) -d $(libdir)/wx/include
|
||||
@ -424,6 +428,8 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
|
||||
@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
|
||||
@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
|
||||
|
||||
$(INSTALL) -d $(includedir)/wx/protocol
|
||||
$(INSTALL) -d $(includedir)/wx/unix
|
||||
@list='$(HEADERS)'; for p in $$list; do \
|
||||
|
||||
21
configure.in
21
configure.in
@ -641,8 +641,8 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_OPTIMISE=no
|
||||
DEFAULT_wxUSE_PROFILE=no
|
||||
DEFAULT_wxUSE_NO_DEPS=no
|
||||
DEFAULT_wxUSE_NO_RTTI=no
|
||||
DEFAULT_wxUSE_NO_EXCEPTIONS=no
|
||||
DEFAULT_wxUSE_NO_RTTI=yes
|
||||
DEFAULT_wxUSE_NO_EXCEPTIONS=yes
|
||||
DEFAULT_wxUSE_PERMISSIVE=no
|
||||
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||
DEFAULT_wxUSE_DEBUG_INFO=yes
|
||||
@ -803,8 +803,8 @@ else
|
||||
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_NO_RTTI=yes
|
||||
DEFAULT_wxUSE_NO_EXCEPTIONS=yes
|
||||
DEFAULT_wxUSE_PERMISSIVE=no
|
||||
DEFAULT_wxUSE_DEBUG_FLAG=no
|
||||
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||
@ -2329,14 +2329,19 @@ if test "$wxUSE_CYGWIN" = 1 ; then
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
|
||||
fi
|
||||
|
||||
lib_unicode_suffix=
|
||||
if test "$wxUSE_UNICODE" = "yes"; then
|
||||
lib_unicode_suffix=u
|
||||
fi
|
||||
|
||||
lib_debug_suffix=
|
||||
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
|
||||
lib_debug_suffix=d
|
||||
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d"
|
||||
fi
|
||||
|
||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}"
|
||||
TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}"
|
||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
|
||||
TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
|
||||
|
||||
if test "$cross_compiling" = "yes"; then
|
||||
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
|
||||
@ -2466,6 +2471,10 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
WX_LIBRARY="wxmsw${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}${WX_RELEASE_NUMBER}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.dll"
|
||||
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
|
||||
WXCONFIG_LIBS="-l${WX_LIBRARY}"
|
||||
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"
|
||||
|
||||
@ -86,6 +86,8 @@
|
||||
$wxMACINCLUDE{$filename} = $fileflags;
|
||||
} elsif ( $filetype eq "MotifH" ) {
|
||||
$wxMOTIFINCLUDE{$filename} = $fileflags;
|
||||
} elsif ( $filetype eq "MSWH" && $fileflags =~ m/O/ ) {
|
||||
$wxOLEINCLUDE{$filename} = $fileflags;
|
||||
} elsif ( $filetype eq "MSWH" ) {
|
||||
$wxMSWINCLUDE{$filename} = $fileflags;
|
||||
} elsif ( $filetype eq "GTKH" ) {
|
||||
|
||||
@ -1163,9 +1163,9 @@ filedlg.h MSWH
|
||||
font.h MSWH
|
||||
fontdlg.h MSWH
|
||||
frame.h MSWH
|
||||
gauge.h MSWH
|
||||
gauge95.h MSWH
|
||||
gaugemsw.h MSWH
|
||||
gccpriv.h MSWH
|
||||
gdiimage.h MSWH
|
||||
gdiobj.h MSWH
|
||||
glcanvas.h MSWH
|
||||
@ -1199,10 +1199,10 @@ registry.h MSWH
|
||||
scrolbar.h MSWH
|
||||
settings.h MSWH
|
||||
setup0.h MSWH
|
||||
slider.h MSWH
|
||||
slider95.h MSWH
|
||||
slidrmsw.h MSWH
|
||||
spinbutt.h MSWH
|
||||
spinctrl.h MSWH
|
||||
statbmp.h MSWH
|
||||
statbox.h MSWH
|
||||
statbr95.h MSWH
|
||||
@ -1216,10 +1216,21 @@ textctrl.h MSWH
|
||||
tglbtn.h MSWH
|
||||
timer.h MSWH
|
||||
tooltip.h MSWH
|
||||
toplevel.h MSWH
|
||||
treectrl.h MSWH
|
||||
wave.h MSWH
|
||||
window.h MSWH
|
||||
winundef.h MSWH
|
||||
|
||||
automtn.h MSWH OLE
|
||||
dataform.h MSWH OLE
|
||||
dataobj.h MSWH OLE
|
||||
dataobj2.h MSWH OLE
|
||||
dropsrc.h MSWH OLE
|
||||
droptgt.h MSWH OLE
|
||||
oleutils.h MSWH OLE
|
||||
uuid.h MSWH OLE
|
||||
|
||||
# blank.cur MSWH
|
||||
# bullseye.cur MSWH
|
||||
# child.ico MSWH
|
||||
|
||||
@ -66,6 +66,10 @@
|
||||
$project{"MSW_HEADERS"} .= "msw/" . $file . " "
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxOLEINCLUDE) {
|
||||
$project{"MSW_HEADERS"} .= "msw/ole/" . $file . " ";
|
||||
}
|
||||
|
||||
foreach $file (sort keys %wxGENERICINCLUDE) {
|
||||
$project{"MSW_HEADERS"} .= "generic/" . $file . " "
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user