From eb2a46e0c123e8fd61f99482a51ebc55f1aae96b Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Sat, 27 Oct 2012 17:45:23 +0200 Subject: [PATCH] [DEV] add files in the copy system --- Build | 2 +- Sources/libewol/Linux.mk | 17 ----------------- Sources/libewol/file.mk | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Build b/Build index c392140f..b3554e26 160000 --- a/Build +++ b/Build @@ -1 +1 @@ -Subproject commit c392140f79cfdda62e8f365744419a92125bde99 +Subproject commit b3554e26a1bb9eaa175374bf77206a42614ff0fe diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index cddcb63f..c4a62d32 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -42,23 +42,6 @@ LOCAL_SRC_FILES := \ ewol/audio/interfacePortAudio.cpp \ $(FILE_LIST) -LOCAL_END_PROJECT_NAME := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__)) - -LOCAL_COPY_FILES := ../../share/textured3D.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.prog \ - ../../share/textured3D.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.frag \ - ../../share/textured3D.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.vert \ - \ - ../../share/color.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/color.prog \ - ../../share/color.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/color.frag \ - ../../share/color.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/color.vert \ - \ - ../../share/textured.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.prog \ - ../../share/textured.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.frag \ - ../../share/textured.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.vert \ - \ - ../../share/widgetEntry.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.prog \ - ../../share/widgetEntry.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.frag \ - ../../share/widgetEntry.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.vert include $(BUILD_STATIC_LIBRARY) diff --git a/Sources/libewol/file.mk b/Sources/libewol/file.mk index 23b112b8..216bdd64 100644 --- a/Sources/libewol/file.mk +++ b/Sources/libewol/file.mk @@ -85,3 +85,19 @@ FILE_LIST+= ewol/audio/audio.cpp \ ewol/audio/decWav.cpp +LOCAL_COPY_FILES := ../../share/textured3D.prog:textured3D.prog \ + ../../share/textured3D.frag:textured3D.frag \ + ../../share/textured3D.vert:textured3D.vert \ + \ + ../../share/color.prog:color.prog \ + ../../share/color.frag:color.frag \ + ../../share/color.vert:color.vert \ + \ + ../../share/textured.prog:textured.prog \ + ../../share/textured.frag:textured.frag \ + ../../share/textured.vert:textured.vert \ + \ + ../../share/widgetEntry.prog:widgetEntry.prog \ + ../../share/widgetEntry.frag:widgetEntry.frag \ + ../../share/widgetEntry.vert:widgetEntry.vert +