diff --git a/Build b/Build index d54c5265..d04dd759 160000 --- a/Build +++ b/Build @@ -1 +1 @@ -Subproject commit d54c52656490040b3d79c2d9bd9cd17ecedb855b +Subproject commit d04dd75956d79935e17972e6fd938abeb477faa8 diff --git a/Sources/libewol/Android.mk b/Sources/libewol/Android.mk index 6e4361d8..2ff499a6 100644 --- a/Sources/libewol/Android.mk +++ b/Sources/libewol/Android.mk @@ -11,7 +11,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev= $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) # name of the dependency -LOCAL_STATIC_LIBRARIES := etk freetype tinyxml libzip libpng agg parsersvg lua +LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua LOCAL_C_INCLUDES := diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index 402002a1..63182695 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -11,7 +11,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev= $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) # name of the dependency -LOCAL_STATIC_LIBRARIES := etk freetype tinyxml libzip libpng agg parsersvg lua portaudio +LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua portaudio LOCAL_C_INCLUDES := diff --git a/Sources/libewol/Windows.mk b/Sources/libewol/Windows.mk index 53e2bda5..6aaff992 100644 --- a/Sources/libewol/Windows.mk +++ b/Sources/libewol/Windows.mk @@ -11,7 +11,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev= $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) # name of the dependency -LOCAL_STATIC_LIBRARIES := etk freetype tinyxml libzip libpng agg parsersvg lua zlib +LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua zlib LOCAL_C_INCLUDES := diff --git a/Sources/libz/Generic.mk b/Sources/libz/Generic.mk index df90cbbf..93d408fb 100644 --- a/Sources/libz/Generic.mk +++ b/Sources/libz/Generic.mk @@ -2,9 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := zlib +LOCAL_MODULE := zlib -LOCAL_LDLIBS := -lz - -include $(EXTERN_LIBRARY) +LOCAL_EXPORT_LDLIBS := -lz +include $(BUILD_PREBUILT)