X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fwxbase%2FMakefile;h=1136c9f60634d70be25ba86fce4142c7ac716524;hb=959b467beb14ce6fa7686ebe1ec089cec7dd966f;hp=00c44c004b96b75f310d85118f4efa494226c792;hpb=36014fef81f6ccb2131ef93c9120552b5ff5ddd7;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile
old mode 100755
new mode 100644
index 00c44c004b..1136c9f606
--- a/libs/wxbase/Makefile
+++ b/libs/wxbase/Makefile
@@ -1,22 +1,23 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wxbase
-PKG_VERSION:=2.6.4
+PKG_VERSION:=2.8.10
 PKG_RELEASE:=1
 
-PKG_SOURCE:=wxBase-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/wxWidgets
-PKG_MD5SUM:=6e55324d2a522d23fd8834ad8656e0b6
+PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/wxwindows
+PKG_MD5SUM:=88b867bc118a183af56efc67014bdf27
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/wxBase-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,8 +25,8 @@ define Package/libwxbase
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Cross-platform C++ framework
-  URL:=http://www.gnu.org/software/libtool/
-  DEPENDS:=+libexpat +uclibcxx +zlib
+  URL:=http://www.wxwidgets.org/
+  DEPENDS:=+libexpat +libstdcpp +zlib
 endef
 
 define Package/libwxbase/description
@@ -36,12 +37,14 @@ define Package/libwxbase/description
  etc.) allowing you to write portable programs easily.
 endef
 
+TARGET_CFLAGS += $(FPIC)
 
 # XXX: aMule *needs* the following configure options to be enabled:
 #	--enable-intl
 #	--enable-largefile
 #	--disable-no_rtti
 #	--with-regex
+#	--enable-unicode
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--disable-rpath \
@@ -70,7 +73,6 @@ CONFIGURE_ARGS+= \
 	--enable-intl \
 	--disable-backtrace \
 	--enable-exceptions \
-	--disable-unicode \
 	--disable-sound \
 	--enable-largefile \
 	\
@@ -103,43 +105,29 @@ CONFIGURE_ARGS+= \
 	--without-sdl-prefix \
 	--without-cppunit-prefix \
 
-CONFIGURE_VARS+= \
-	CXX="g++-uc+std" \
-
-define Build/Configure
-	$(call Build/Configure/Default,)
-endef
+UNICODE=yes
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+ifeq ($(UNICODE),yes)
+  CONFIGURE_ARGS+= --enable-unicode
+  LIB_PFX:=u
+else
+  CONFIGURE_ARGS+= --disable-unicode
+  LIB_PFX:=
+endif
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(STAGING_DIR)/usr/lib/
-	$(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(STAGING_DIR)/usr/bin/wx-config
-	$(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(STAGING_DIR)/usr/bin/wx-config
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/wx-config \
-		$(STAGING_DIR)/usr/include/wx-2.6 \
-		$(STAGING_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so \
-		$(STAGING_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* \
-		$(STAGING_DIR)/usr/lib/wx
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
+	$(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
+	$(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config
+	$(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config
 endef
 
 define Package/libwxbase/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libwxbase))