[DEV] compilation error
This commit is contained in:
parent
d56017aacf
commit
28a044fb00
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -38,6 +38,3 @@
|
||||
[submodule "external/z/zlib"]
|
||||
path = external/z/zlib
|
||||
url = https://github.com/madler/zlib.git
|
||||
[submodule "external/ode"]
|
||||
path = external/ode
|
||||
url = https://github.com/HeeroYui/ode.git
|
||||
|
@ -19,7 +19,7 @@ USER_PACKAGES+= $(TMP_DIR)/external/portaudio
|
||||
USER_PACKAGES+= $(TMP_DIR)/external/tinyxml
|
||||
USER_PACKAGES+= $(TMP_DIR)/external/z
|
||||
USER_PACKAGES+= $(TMP_DIR)/external/zip
|
||||
USER_PACKAGES+= $(TMP_DIR)/external/ode
|
||||
USER_PACKAGES+= $(TMP_DIR)/external/ePhysics
|
||||
|
||||
#include te generic toolchain :
|
||||
include $(TMP_DIR)/build/Makefile.mk
|
||||
|
2
external/etk
vendored
2
external/etk
vendored
@ -1 +1 @@
|
||||
Subproject commit 033c9dd63a75db8afb448760cdb59bc8f89d5e7a
|
||||
Subproject commit 74a6e35fa3de3bc5b2b0dc89992e6610db2014c2
|
1
external/ode
vendored
1
external/ode
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 7e4c9495b4688c4387402897922f0e258338a9ec
|
@ -12,7 +12,7 @@ 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 ode
|
||||
LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua portaudio ephysics
|
||||
|
||||
LOCAL_C_INCLUDES :=
|
||||
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <etk/math/Vector3D.h>
|
||||
#include <etk/Vector.h>
|
||||
#include <ewol/debug.h>
|
||||
|
||||
namespace game
|
||||
|
@ -12,6 +12,7 @@
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <ewol/debug.h>
|
||||
#include <ewol/game/Element.h>
|
||||
|
||||
namespace game
|
||||
{
|
||||
|
@ -26,12 +26,12 @@ namespace ewol
|
||||
int32_t m_GLColor;
|
||||
int32_t m_GLtexture;
|
||||
int32_t m_GLtexID;
|
||||
etk::Vector<uint32_t> m_indices;
|
||||
etk::Vector< vec3 > m_vertices;
|
||||
etk::Vector< vec2 > m_uvTextures;
|
||||
etk::Vector< vec3 > m_normals;
|
||||
ewol::TextureFile* m_texture1;
|
||||
etk::Vector<draw::Colorf> m_coordColor; //!< internal color of the different point
|
||||
etk::Vector<uint32_t> m_indices;
|
||||
etk::Vector< vec3 > m_vertices;
|
||||
etk::Vector< vec2 > m_uvTextures;
|
||||
etk::Vector< vec3 > m_normals;
|
||||
ewol::TextureFile* m_texture1;
|
||||
etk::Vector<draw::Colorf> m_coordColor; //!< internal color of the different point
|
||||
public:
|
||||
Mesh(etk::UString genName);
|
||||
virtual ~Mesh(void);
|
||||
|
@ -14,7 +14,7 @@
|
||||
#undef __class__
|
||||
#define __class__ "Scene"
|
||||
|
||||
widget::Scene::Scene(ewol::GameEngine* gameEngine) :
|
||||
widget::Scene::Scene(game::Engine* gameEngine) :
|
||||
m_gameEngine(gameEngine),
|
||||
m_isRunning(true),
|
||||
m_lastCallTime(-1)
|
||||
|
@ -11,8 +11,10 @@
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <etk/math/Vector3D.h>
|
||||
#include <etk/Vector.h>
|
||||
#include <ewol/debug.h>
|
||||
#include <ewol/game/Engine.h>
|
||||
#include <ewol/game/Element.h>
|
||||
#include <ewol/widget/Widget.h>
|
||||
|
||||
|
||||
@ -28,7 +30,7 @@ namespace widget {
|
||||
* @brief Main scene constructor
|
||||
* @param[in] gameEngine Used game engine for the display (can be NULL).
|
||||
*/
|
||||
Scene(ewol::GameEngine* gameEngine=NULL);
|
||||
Scene(game::Engine* gameEngine=NULL);
|
||||
/**
|
||||
* @brief Destructor
|
||||
* @note The engine is not destroy, it is the reponsability of the user
|
||||
|
@ -80,7 +80,8 @@ FILE_LIST+= ewol/widget/Widget.cpp \
|
||||
|
||||
# game mode area :
|
||||
FILE_LIST+= ewol/widget/Scene.cpp \
|
||||
ewol/game/GameEngine.cpp
|
||||
ewol/game/Engine.cpp \
|
||||
ewol/game/Element.cpp
|
||||
|
||||
|
||||
LOCAL_COPY_FILES := ../data/textured3D.prog:textured3D.prog \
|
||||
|
Loading…
x
Reference in New Issue
Block a user