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

[DEV] Remove some dependency of the sub library

Browse Source
This commit is contained in:
Edouard DUPIN 2013-03-11 22:55:34 +01:00
parent 228999d144
commit d84e4b8d53
8 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build

@ -1 +1 @@
Subproject commit 1177a53e86c62ce8ed9d74860ef4e9eefd97c287
Subproject commit 50b04244084ced7421ed260866612fcbb547e1c8

2
external/etk vendored

@ -1 +1 @@
Subproject commit d51539f32a108eea88e017abad8cb604907dacbf
Subproject commit f5f7c72ad695876cf63056424f93e863884034dd

11
sources/Android.mk
View File

@ -14,6 +14,17 @@ $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
# name of the dependency
LOCAL_LIBRARIES := etk freetype tinyxml libpng parsersvg lua libzip bullet
LOCAL_LIBRARIES := etk freetype tinyxml libpng parsersvg libzip
ifeq ("$(CONFIG_BUILD_BULLET)","y")
LOCAL_LIBRARIES += bullet
endif
ifeq ("$(CONFIG_BUILD_LUA)","y")
LOCAL_LIBRARIES += lua
endif
ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
#LOCAL_LIBRARIES += portaudio
endif
LOCAL_C_INCLUDES :=
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)

18
sources/Linux.mk
View File

@ -12,7 +12,16 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag)
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
# name of the dependency
LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua portaudio bullet
LOCAL_LIBRARIES := etk freetype tinyxml libpng parsersvg
ifeq ("$(CONFIG_BUILD_BULLET)","y")
LOCAL_LIBRARIES += bullet
endif
ifeq ("$(CONFIG_BUILD_LUA)","y")
LOCAL_LIBRARIES += lua
endif
ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
LOCAL_LIBRARIES += portaudio
endif
LOCAL_C_INCLUDES :=
@ -41,8 +50,11 @@ LOCAL_EXPORT_CFLAGS :=
# load the common sources file of the platform
include $(LOCAL_PATH)/file.mk
LOCAL_SRC_FILES := $(FILE_LIST) \
ewol/renderer/audio/interfacePortAudio.cpp
LOCAL_SRC_FILES := $(FILE_LIST)
ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
LOCAL_SRC_FILES += ewol/renderer/audio/interfacePortAudio.cpp
endif
ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_X11__)","y")
LOCAL_SRC_FILES += ewol/renderer/os/gui.X11.cpp

14
sources/MacOs.mk
View File

@ -12,7 +12,19 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag)
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
# name of the dependency
LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua bullet
LOCAL_LIBRARIES := etk freetype tinyxml libpng parsersvg
ifeq ("$(CONFIG_BUILD_BULLET)","y")
LOCAL_LIBRARIES += bullet
endif
ifeq ("$(CONFIG_BUILD_LUA)","y")
LOCAL_LIBRARIES += lua
endif
ifeq ("$(CONFIG_BUILD_PORTAUDIO)","y")
LOCAL_LIBRARIES += portaudio
endif
ifeq ("$(CONFIG_BUILD_LIBZIP)","y")
LOCAL_LIBRARIES += libzip
endif
LOCAL_C_INCLUDES :=

6
sources/ewol/renderer/audio/audio.cpp
View File

@ -26,7 +26,7 @@ static int32_t effectsVolumeApply = 1<<16;
static bool isInit = false;
#ifdef __TARGET_OS__Linux
#ifdef BUILD_PORTAUDIO
# include <ewol/renderer/audio/interfacePortAudio.h>
#endif
@ -41,7 +41,7 @@ void ewol::audio::Init(void)
ewol::audio::music::MuteSet(false);
musicFadingTime = 100;
isInit = true;
#ifdef __TARGET_OS__Linux
#ifdef BUILD_PORTAUDIO
ewol::portAudio::Init();
#endif
}
@ -53,7 +53,7 @@ void ewol::audio::UnInit(void)
EWOL_ERROR("multiple un-init requested ... at the audio system ...");
return;
}
#ifdef __TARGET_OS__Linux
#ifdef BUILD_PORTAUDIO
ewol::portAudio::UnInit();
#endif
musicMute = true;

2
sources/ewol/widget/Scene.cpp
View File

@ -5,6 +5,7 @@
*
* @license BSD v3 (see license file)
*/
#ifdef BUILD_BULLET
#include <ewol/widget/Scene.h>
#include <math.h>
@ -1282,4 +1283,5 @@ void widget::Scene::OnLostFocus(void)
UnGrabCursor();
}
#endif

4
sources/ewol/widget/Scene.h
View File

@ -9,6 +9,8 @@
#ifndef __EWOL_SCENE_H__
#define __EWOL_SCENE_H__
#ifdef BUILD_BULLET
#include <etk/types.h>
#include <etk/math/Vector3D.h>
#include <etk/math/Matrix4.h>
@ -127,3 +129,5 @@ namespace widget {
};
#endif
#endif