atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] copy files in the staging directly

Browse Source
This commit is contained in:
Edouard Dupin 2012-10-27 01:30:59 +02:00
parent 89fee7fab5
commit cb854ca972
4 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build

@ -1 +1 @@
Subproject commit a42715960bdb78614c78830517b112cb88cd3627 Subproject commit c392140f79cfdda62e8f365744419a92125bde99

9
Sources/libetk/etk/os/File.cpp
View File

@ -127,18 +127,19 @@ void etk::InitDefaultFolder(const char * applName)
#ifdef MODE_RELEASE #ifdef MODE_RELEASE
baseFolderData = "/usr/share/"; baseFolderData = "/usr/share/";
baseFolderData += baseApplName;
baseFolderData += "/";
#else #else
char cCurrentPath[FILENAME_MAX]; char cCurrentPath[FILENAME_MAX];
if (!getcwd(cCurrentPath, FILENAME_MAX)) { if (!getcwd(cCurrentPath, FILENAME_MAX)) {
baseFolderData = "./share/"; baseFolderData = "./out/Linux/debug/staging/usr/share/";
} else { } else {
cCurrentPath[FILENAME_MAX - 1] = '\0'; cCurrentPath[FILENAME_MAX - 1] = '\0';
baseFolderData = cCurrentPath; baseFolderData = cCurrentPath;
baseFolderData += "/share/"; baseFolderData += "/out/Linux/debug/staging/usr/share/";
} }
#endif #endif
baseFolderData += baseApplName;
baseFolderData += "/";
baseFolderDataUser = baseFolderHome; baseFolderDataUser = baseFolderHome;
baseFolderDataUser += "/."; baseFolderDataUser += "/.";
baseFolderDataUser += baseApplName; baseFolderDataUser += baseApplName;

7
Sources/libewol/Config.in
View File

@ -12,13 +12,6 @@ menu "General"
bool "1: openGl ES 2.0" bool "1: openGl ES 2.0"
endchoice endchoice
config __EWOL_APPL_NAME__
prompt "Application Name"
string
default "Ewol__"
help
This is the application name
config __EWOL_APPL_BASIC_TITLE__ config __EWOL_APPL_BASIC_TITLE__
prompt "Application Title" prompt "Application Title"
string string

25
Sources/libewol/Linux.mk
View File

@ -42,22 +42,23 @@ LOCAL_SRC_FILES := \
ewol/audio/interfacePortAudio.cpp \ ewol/audio/interfacePortAudio.cpp \
$(FILE_LIST) $(FILE_LIST)
LOCAL_END_PROJECT_NAME := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
LOCAL_COPY_FILES := ../../share/textured3D.prog:usr/share/edn/textured3D.prog \ LOCAL_COPY_FILES := ../../share/textured3D.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.prog \
../../share/textured3D.frag:usr/share/edn/textured3D.frag \ ../../share/textured3D.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.frag \
../../share/textured3D.vert:usr/share/edn/textured3D.vert \ ../../share/textured3D.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/textured3D.vert \
\ \
../../share/color.prog:usr/share/edn/color.prog \ ../../share/color.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/color.prog \
../../share/color.frag:usr/share/edn/color.frag \ ../../share/color.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/color.frag \
../../share/color.vert:usr/share/edn/color.vert \ ../../share/color.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/color.vert \
\ \
../../share/textured.prog:usr/share/edn/textured.prog \ ../../share/textured.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.prog \
../../share/textured.frag:usr/share/edn/textured.frag \ ../../share/textured.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.frag \
../../share/textured.vert:usr/share/edn/textured.vert \ ../../share/textured.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/textured.vert \
\ \
../../share/widgetEntry.prog:usr/share/edn/widgetEntry.prog \ ../../share/widgetEntry.prog:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.prog \
../../share/widgetEntry.frag:usr/share/edn/widgetEntry.frag \ ../../share/widgetEntry.frag:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.frag \
../../share/widgetEntry.vert:usr/share/edn/widgetEntry.vert ../../share/widgetEntry.vert:usr/share/$(LOCAL_END_PROJECT_NAME)/widgetEntry.vert
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)