[DEV] rework of the external lib tree ended

This commit is contained in:
Edouard DUPIN 2012-11-10 16:23:44 +01:00
parent e81fa93885
commit 59e59142ed
32 changed files with 50 additions and 26 deletions

24
Makefile.mk Normal file
View File

@ -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

2
build

@ -1 +1 @@
Subproject commit a9bfdcbc6bad8a1b435296b71d852631ab38a76e
Subproject commit 858172d2c00fe72b1ec4c7ee458c07243d97eb0f

2
external/etk vendored

@ -1 +1 @@
Subproject commit 167829eb736b8ce276cd41cf921c6b912bcd5b44
Subproject commit c920396923f600e6f9b61780a00a0a18a69a7277

2
external/parsersvg vendored

@ -1 +1 @@
Subproject commit fcd7a0542ea39a8164ca97b832965adc6fda08ee
Subproject commit 2697e6940e2549e4c6725911d049ae3a92efe2f9

View File

@ -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