Backed out misguided 'build both' patch.
Reshuffled library name code into a slightly neater stack. Added separate shared and static msw builds to .debs :( that makes 13 builds of the core lib alone required to create all packages now.. (anyone want to donate me a fast MP box :) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
a0b0370119
commit
978f1259ac
68
configure.in
68
configure.in
@ -370,6 +370,8 @@ WX_RELEASE_NUMBER=2
|
||||
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
|
||||
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
|
||||
|
||||
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
|
||||
|
||||
WX_CURRENT=1
|
||||
WX_REVISION=0
|
||||
WX_AGE=0
|
||||
@ -2366,17 +2368,6 @@ dnl library link name
|
||||
WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
|
||||
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
|
||||
|
||||
dnl define which libs wx-config should link.
|
||||
WXCONFIG_LIBS="-l${WX_LIBRARY}"
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
|
||||
fi
|
||||
|
||||
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}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
|
||||
@ -2391,6 +2382,35 @@ dnl the name of the resources file for wxMac
|
||||
WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
|
||||
WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
|
||||
dnl If we are cross compiling we want to use the 'full' unix type name for the
|
||||
dnl lib, but for a native install use the windows style naming convention.
|
||||
|
||||
dnl FIXME: is this GL stuff actually even used for wxMSW? should it be??
|
||||
|
||||
if test "$cross_compiling" != "yes"; then
|
||||
WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
fi
|
||||
|
||||
esac
|
||||
|
||||
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 define which libs wx-config should link.
|
||||
WXCONFIG_LIBS="-l${WX_LIBRARY}"
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
|
||||
fi
|
||||
|
||||
|
||||
dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
|
||||
|
||||
if test "$wxUSE_SHARED" = "yes"; then
|
||||
@ -2485,26 +2505,13 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
dnl If we are cross compiling we want to use the 'full' unix type name for the
|
||||
dnl lib, but for a native install use the windows style naming convention.
|
||||
|
||||
if test "$cross_compiling" != "yes"; then
|
||||
WX_LIBRARY="wxmsw${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}${WX_RELEASE_NUMBER}${lib_unicode_suffix}${lib_debug_suffix}"
|
||||
WX_LIBRARY_GL=${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}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
|
||||
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
|
||||
fi
|
||||
|
||||
WX_LIBRARY_IMPORTLIB="lib${WX_LIBRARY}.lib"
|
||||
|
||||
dnl FIXME: this is a hack.. do we need a --static flag to wx-config?
|
||||
if test "$wxUSE_SHARED" = "yes" ; then
|
||||
WXCONFIG_LIBS="${WX_LIBRARY_IMPORTLIB}"
|
||||
else
|
||||
WXCONFIG_LIBS="-l${WX_LIBRARY}"
|
||||
fi
|
||||
dnl or is this just plain wrong?
|
||||
dnl This is NOT compatible with both static and dynamic linking
|
||||
WXCONFIG_LIBS="${WX_LIBRARY_IMPORTLIB}"
|
||||
|
||||
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
|
||||
@ -2513,13 +2520,12 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
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_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_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} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
|
||||
WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
|
||||
fi
|
||||
dnl -fPIC is not required for mingw build -- all code is already
|
||||
dnl position independent. Because of this we can (and do) build
|
||||
dnl a static lib from the same object files as the dll.
|
||||
dnl position independent.
|
||||
PIC_FLAG=
|
||||
;;
|
||||
|
||||
|
||||
77
debian/rules
vendored
77
debian/rules
vendored
@ -56,15 +56,18 @@ objdir_i18n=locale
|
||||
|
||||
objdir_gtk_univ=objs_gtk_univ
|
||||
|
||||
objdir_wxbase_msw_dev=objs_wxbase_msw_dev
|
||||
objdir_wxbase_msw_dbg=objs_wxbase_msw_dbg
|
||||
objdir_msw_dev=objs_msw_dev
|
||||
objdir_msw_dbg=objs_msw_dbg
|
||||
objdir_wxbase_msw_shared=objs_wxbase_msw_sh
|
||||
objdir_wxbase_msw_static=objs_wxbase_msw_st
|
||||
objdir_wxbase_msw_dbg=objs_wxbase_msw_d
|
||||
objdir_msw_shared=objs_msw_sh
|
||||
objdir_msw_static=objs_msw_st
|
||||
objdir_msw_dbg=objs_msw_d
|
||||
|
||||
objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
|
||||
$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
|
||||
$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
|
||||
$(objdir_wxbase_msw_dev) $(objdir_wxbase_msw_dbg) $(objdir_msw_dev) $(objdir_msw_dbg)
|
||||
$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \
|
||||
$(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
|
||||
|
||||
# note that the i18n package is actually arch indep (once built)
|
||||
# but must be built (and installed) during the arch any phase as
|
||||
@ -80,7 +83,9 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
|
||||
|
||||
build_indep_stamps=build-examples-stamp build-doc-stamp
|
||||
|
||||
build_cross_stamps=build-wxbase-msw-dev-stamp build-wxbase-msw-dbg-stamp build-msw-dev-stamp build-msw-dbg-stamp
|
||||
build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
|
||||
build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
|
||||
build-msw-static-stamp build-msw-dbg-stamp
|
||||
|
||||
build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
|
||||
|
||||
@ -389,10 +394,10 @@ build-i18n-stamp: build-gtk-shared-stamp
|
||||
&& $(MAKE) allmo
|
||||
touch $@
|
||||
|
||||
build-wxbase-msw-dev-stamp:
|
||||
build-wxbase-msw-shared-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_wxbase_msw_dev)
|
||||
cd $(objdir_wxbase_msw_dev) \
|
||||
mkdir -p $(objdir_wxbase_msw_shared)
|
||||
cd $(objdir_wxbase_msw_shared) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=$(config_cache_cross) \
|
||||
--host=$(cross_host) \
|
||||
@ -401,6 +406,20 @@ build-wxbase-msw-dev-stamp:
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-wxbase-msw-static-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_wxbase_msw_static)
|
||||
cd $(objdir_wxbase_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=$(config_cache_cross) \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--disable-gui \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
# Note this builds dll only, since wxmsw static debug is > 130MB !
|
||||
build-wxbase-msw-dbg-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_wxbase_msw_dbg)
|
||||
@ -414,10 +433,10 @@ build-wxbase-msw-dbg-stamp:
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-msw-dev-stamp:
|
||||
build-msw-shared-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_msw_dev)
|
||||
cd $(objdir_msw_dev) \
|
||||
mkdir -p $(objdir_msw_shared)
|
||||
cd $(objdir_msw_shared) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=$(config_cache_cross) \
|
||||
--host=$(cross_host) \
|
||||
@ -425,6 +444,18 @@ build-msw-dev-stamp:
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-msw-static-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_msw_static)
|
||||
cd $(objdir_msw_static) \
|
||||
&& ../configure --prefix=/usr/$(cross_host) \
|
||||
--cache-file=$(config_cache_cross) \
|
||||
--host=$(cross_host) \
|
||||
--build=$(cross_build) \
|
||||
--disable-shared \
|
||||
&& $(MAKE)
|
||||
touch $@
|
||||
|
||||
build-msw-dbg-stamp:
|
||||
dh_testdir
|
||||
mkdir -p $(objdir_msw_dbg)
|
||||
@ -442,7 +473,7 @@ clean: debian/control
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
||||
rm -rf config_deb.cache control-files-stamp $(build_stamps) $(objdirs)
|
||||
rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
|
||||
rm -f docs/lgpl.txt
|
||||
rm -f docs/latex/wx/manual.bb
|
||||
rm -f $(objdir_i18n)/*.mo
|
||||
@ -615,13 +646,14 @@ install-examples: build-examples-stamp
|
||||
dh_installdirs
|
||||
|
||||
install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
|
||||
install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
|
||||
install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_msw_dev)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_wxbase_msw_dev)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
|
||||
cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
|
||||
cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_wxbase_msw_shared)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
|
||||
@ -632,16 +664,18 @@ install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
|
||||
dh_installdirs
|
||||
cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
|
||||
cp $(objdir_wxbase_msw_dbg)/wxbased-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a
|
||||
# No static lib, they're freakin' huge!
|
||||
#$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
|
||||
install-msw-dev: build-msw-dev-stamp
|
||||
install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
cp -a $(objdir_msw_dev)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_msw_dev)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
|
||||
cp -a $(objdir_msw_shared)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
|
||||
cp -a $(objdir_msw_static)/lib/*.a debian/$(package_msw_dev)/usr/$(cross_host)/lib
|
||||
cp $(objdir_msw_shared)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
|
||||
@ -652,7 +686,8 @@ install-msw-dbg: build-msw-dbg-stamp
|
||||
dh_installdirs
|
||||
cp -a $(objdir_msw_dbg)/lib/* debian/$(package_msw_dbg)/usr/$(cross_host)/lib
|
||||
cp $(objdir_msw_dbg)/wxmswd-$(release)-$(cross_host)-config debian/$(package_msw_dbg)/usr/bin/
|
||||
$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
|
||||
# No static lib, they're freakin' huge!
|
||||
#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
|
||||
|
||||
install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
|
||||
install-headers-msw:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user