Changeset 17772


Ignore:
Timestamp:
2009-09-27T23:12:46+02:00 (7 years ago)
Author:
florian
Message:

[package] enable unicode by default in wxbase now, required for the new amule version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/wxbase/Makefile

    r15247 r17772  
    11#  
    2 # Copyright (C) 2007-2008 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=wxbase 
    1111PKG_VERSION:=2.8.7 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2 
     
    4343#       --disable-no_rtti 
    4444#       --with-regex 
     45#       --enable-unicode 
    4546CONFIGURE_ARGS+= \ 
    4647        --enable-shared \ 
     
    7172        --disable-backtrace \ 
    7273        --enable-exceptions \ 
    73         --disable-unicode \ 
    7474        --disable-sound \ 
    7575        --enable-largefile \ 
     
    104104        --without-cppunit-prefix \ 
    105105 
     106UNICODE=yes 
     107 
     108ifeq ($(UNICODE),yes) 
     109CONFIGURE_ARGS += --enable-unicode 
     110LIB_PFX:=u 
     111else 
     112CONFIGURE_ARGS += --disable-unicode 
     113LIB_PFX:= 
     114endif 
     115 
    106116define Build/Compile 
    107117        $(MAKE) -C $(PKG_BUILD_DIR) \ 
     
    114124        $(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/ 
    115125        $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/ 
    116         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8-*.so $(1)/usr/lib/ 
    117         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8.so.* $(1)/usr/lib/ 
     126        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8-*.so $(1)/usr/lib/ 
     127        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8.so.* $(1)/usr/lib/ 
    118128        $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ 
    119129        $(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config 
     
    123133define Package/libwxbase/install 
    124134        $(INSTALL_DIR) $(1)/usr/lib 
    125         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.8.so.* $(1)/usr/lib/ 
     135        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-2.8.so.* $(1)/usr/lib/ 
    126136endef 
    127137 
Note: See TracChangeset for help on using the changeset viewer.