diff --git a/Makefile.mk b/Makefile.mk new file mode 100644 index 00000000..f481f8ce --- /dev/null +++ b/Makefile.mk @@ -0,0 +1,24 @@ + +# get the local dir in a good form : +TMP_DIR := $(shell readlink -m -n $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))) + + +# Add ewol packages +EWOL_FOLDER:=$(TMP_DIR) +USER_PACKAGES+= $(TMP_DIR)/sources/ +# Add external librairy (direct folder to reduce the search time (really special case for windows ...)) +USER_PACKAGES+= $(TMP_DIR)/external/etk +USER_PACKAGES+= $(TMP_DIR)/external/agg +USER_PACKAGES+= $(TMP_DIR)/external/freetype +USER_PACKAGES+= $(TMP_DIR)/external/glew +USER_PACKAGES+= $(TMP_DIR)/external/lua +USER_PACKAGES+= $(TMP_DIR)/external/ogg +USER_PACKAGES+= $(TMP_DIR)/external/parsersvg +USER_PACKAGES+= $(TMP_DIR)/external/png +USER_PACKAGES+= $(TMP_DIR)/external/portaudio +USER_PACKAGES+= $(TMP_DIR)/external/tinyxml +USER_PACKAGES+= $(TMP_DIR)/external/z +USER_PACKAGES+= $(TMP_DIR)/external/zip + +#include te generic toolchain : +include $(TMP_DIR)/build/Makefile.mk diff --git a/build b/build index a9bfdcbc..858172d2 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit a9bfdcbc6bad8a1b435296b71d852631ab38a76e +Subproject commit 858172d2c00fe72b1ec4c7ee458c07243d97eb0f diff --git a/share/color.frag b/data/color.frag similarity index 100% rename from share/color.frag rename to data/color.frag diff --git a/share/color.prog b/data/color.prog similarity index 100% rename from share/color.prog rename to data/color.prog diff --git a/share/color.vert b/data/color.vert similarity index 100% rename from share/color.vert rename to data/color.vert diff --git a/share/fontDistanceField/font1.frag b/data/fontDistanceField/font1.frag similarity index 100% rename from share/fontDistanceField/font1.frag rename to data/fontDistanceField/font1.frag diff --git a/share/fontDistanceField/font1.prog b/data/fontDistanceField/font1.prog similarity index 100% rename from share/fontDistanceField/font1.prog rename to data/fontDistanceField/font1.prog diff --git a/share/fontDistanceField/font1.vert b/data/fontDistanceField/font1.vert similarity index 100% rename from share/fontDistanceField/font1.vert rename to data/fontDistanceField/font1.vert diff --git a/share/fontDistanceField/font2.frag b/data/fontDistanceField/font2.frag similarity index 100% rename from share/fontDistanceField/font2.frag rename to data/fontDistanceField/font2.frag diff --git a/share/textured.frag b/data/textured.frag similarity index 100% rename from share/textured.frag rename to data/textured.frag diff --git a/share/textured.prog b/data/textured.prog similarity index 100% rename from share/textured.prog rename to data/textured.prog diff --git a/share/textured.vert b/data/textured.vert similarity index 100% rename from share/textured.vert rename to data/textured.vert diff --git a/share/textured3D.frag b/data/textured3D.frag similarity index 100% rename from share/textured3D.frag rename to data/textured3D.frag diff --git a/share/textured3D.prog b/data/textured3D.prog similarity index 100% rename from share/textured3D.prog rename to data/textured3D.prog diff --git a/share/textured3D.vert b/data/textured3D.vert similarity index 100% rename from share/textured3D.vert rename to data/textured3D.vert diff --git a/share/theme/default/widgetButton.conf b/data/theme/default/widgetButton.conf similarity index 100% rename from share/theme/default/widgetButton.conf rename to data/theme/default/widgetButton.conf diff --git a/share/theme/default/widgetButton.frag b/data/theme/default/widgetButton.frag similarity index 100% rename from share/theme/default/widgetButton.frag rename to data/theme/default/widgetButton.frag diff --git a/share/theme/default/widgetButton.prog b/data/theme/default/widgetButton.prog similarity index 100% rename from share/theme/default/widgetButton.prog rename to data/theme/default/widgetButton.prog diff --git a/share/theme/default/widgetButton.vert b/data/theme/default/widgetButton.vert similarity index 100% rename from share/theme/default/widgetButton.vert rename to data/theme/default/widgetButton.vert diff --git a/share/theme/default/widgetEntry.frag b/data/theme/default/widgetEntry.frag similarity index 100% rename from share/theme/default/widgetEntry.frag rename to data/theme/default/widgetEntry.frag diff --git a/share/theme/default/widgetEntry.prog b/data/theme/default/widgetEntry.prog similarity index 100% rename from share/theme/default/widgetEntry.prog rename to data/theme/default/widgetEntry.prog diff --git a/share/theme/default/widgetEntry.vert b/data/theme/default/widgetEntry.vert similarity index 100% rename from share/theme/default/widgetEntry.vert rename to data/theme/default/widgetEntry.vert diff --git a/share/theme/rounded/widgetButton.conf b/data/theme/rounded/widgetButton.conf similarity index 100% rename from share/theme/rounded/widgetButton.conf rename to data/theme/rounded/widgetButton.conf diff --git a/share/theme/rounded/widgetButton.frag b/data/theme/rounded/widgetButton.frag similarity index 100% rename from share/theme/rounded/widgetButton.frag rename to data/theme/rounded/widgetButton.frag diff --git a/share/theme/rounded/widgetButton.prog b/data/theme/rounded/widgetButton.prog similarity index 100% rename from share/theme/rounded/widgetButton.prog rename to data/theme/rounded/widgetButton.prog diff --git a/share/theme/rounded/widgetButton.vert b/data/theme/rounded/widgetButton.vert similarity index 100% rename from share/theme/rounded/widgetButton.vert rename to data/theme/rounded/widgetButton.vert diff --git a/share/theme/rounded/widgetEntry.frag b/data/theme/rounded/widgetEntry.frag similarity index 100% rename from share/theme/rounded/widgetEntry.frag rename to data/theme/rounded/widgetEntry.frag diff --git a/share/theme/rounded/widgetEntry.prog b/data/theme/rounded/widgetEntry.prog similarity index 100% rename from share/theme/rounded/widgetEntry.prog rename to data/theme/rounded/widgetEntry.prog diff --git a/share/theme/rounded/widgetEntry.vert b/data/theme/rounded/widgetEntry.vert similarity index 100% rename from share/theme/rounded/widgetEntry.vert rename to data/theme/rounded/widgetEntry.vert diff --git a/external/etk b/external/etk index 167829eb..c9203969 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 167829eb736b8ce276cd41cf921c6b912bcd5b44 +Subproject commit c920396923f600e6f9b61780a00a0a18a69a7277 diff --git a/external/parsersvg b/external/parsersvg index fcd7a054..2697e694 160000 --- a/external/parsersvg +++ b/external/parsersvg @@ -1 +1 @@ -Subproject commit fcd7a0542ea39a8164ca97b832965adc6fda08ee +Subproject commit 2697e6940e2549e4c6725911d049ae3a92efe2f9 diff --git a/sources/file.mk b/sources/file.mk index 6fdb56bb..89316c8c 100644 --- a/sources/file.mk +++ b/sources/file.mk @@ -91,33 +91,33 @@ 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 \ +LOCAL_COPY_FILES := ../data/textured3D.prog:textured3D.prog \ + ../data/textured3D.frag:textured3D.frag \ + ../data/textured3D.vert:textured3D.vert \ \ - ../../share/color.prog:color.prog \ - ../../share/color.frag:color.frag \ - ../../share/color.vert:color.vert \ + ../data/color.prog:color.prog \ + ../data/color.frag:color.frag \ + ../data/color.vert:color.vert \ \ - ../../share/textured.prog:textured.prog \ - ../../share/textured.frag:textured.frag \ - ../../share/textured.vert:textured.vert \ + ../data/textured.prog:textured.prog \ + ../data/textured.frag:textured.frag \ + ../data/textured.vert:textured.vert \ \ - ../../share/theme/default/widgetEntry.prog:theme/default/widgetEntry.prog \ - ../../share/theme/default/widgetEntry.frag:theme/default/widgetEntry.frag \ - ../../share/theme/default/widgetEntry.vert:theme/default/widgetEntry.vert \ + ../data/theme/default/widgetEntry.prog:theme/default/widgetEntry.prog \ + ../data/theme/default/widgetEntry.frag:theme/default/widgetEntry.frag \ + ../data/theme/default/widgetEntry.vert:theme/default/widgetEntry.vert \ \ - ../../share/theme/rounded/widgetEntry.prog:theme/rounded/widgetEntry.prog \ - ../../share/theme/rounded/widgetEntry.frag:theme/rounded/widgetEntry.frag \ - ../../share/theme/rounded/widgetEntry.vert:theme/rounded/widgetEntry.vert \ + ../data/theme/rounded/widgetEntry.prog:theme/rounded/widgetEntry.prog \ + ../data/theme/rounded/widgetEntry.frag:theme/rounded/widgetEntry.frag \ + ../data/theme/rounded/widgetEntry.vert:theme/rounded/widgetEntry.vert \ \ - ../../share/theme/default/widgetButton.conf:theme/default/widgetButton.conf \ - ../../share/theme/default/widgetButton.prog:theme/default/widgetButton.prog \ - ../../share/theme/default/widgetButton.frag:theme/default/widgetButton.frag \ - ../../share/theme/default/widgetButton.vert:theme/default/widgetButton.vert \ + ../data/theme/default/widgetButton.conf:theme/default/widgetButton.conf \ + ../data/theme/default/widgetButton.prog:theme/default/widgetButton.prog \ + ../data/theme/default/widgetButton.frag:theme/default/widgetButton.frag \ + ../data/theme/default/widgetButton.vert:theme/default/widgetButton.vert \ \ - ../../share/theme/rounded/widgetButton.conf:theme/rounded/widgetButton.conf \ - ../../share/theme/rounded/widgetButton.prog:theme/rounded/widgetButton.prog \ - ../../share/theme/rounded/widgetButton.frag:theme/rounded/widgetButton.frag \ - ../../share/theme/rounded/widgetButton.vert:theme/rounded/widgetButton.vert + ../data/theme/rounded/widgetButton.conf:theme/rounded/widgetButton.conf \ + ../data/theme/rounded/widgetButton.prog:theme/rounded/widgetButton.prog \ + ../data/theme/rounded/widgetButton.frag:theme/rounded/widgetButton.frag \ + ../data/theme/rounded/widgetButton.vert:theme/rounded/widgetButton.vert