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

[DEV] compilation error

Browse Source
This commit is contained in:
Edouard DUPIN 2012-12-13 22:30:57 +01:00
parent d56017aacf
commit 28a044fb00
11 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -38,6 +38,3 @@
[submodule "external/z/zlib"] [submodule "external/z/zlib"]
path = external/z/zlib path = external/z/zlib
url = https://github.com/madler/zlib.git url = https://github.com/madler/zlib.git
[submodule "external/ode"]
path = external/ode
url = https://github.com/HeeroYui/ode.git

2
Makefile.mk
View File

@ -19,7 +19,7 @@ USER_PACKAGES+= $(TMP_DIR)/external/portaudio
USER_PACKAGES+= $(TMP_DIR)/external/tinyxml USER_PACKAGES+= $(TMP_DIR)/external/tinyxml
USER_PACKAGES+= $(TMP_DIR)/external/z USER_PACKAGES+= $(TMP_DIR)/external/z
USER_PACKAGES+= $(TMP_DIR)/external/zip USER_PACKAGES+= $(TMP_DIR)/external/zip
USER_PACKAGES+= $(TMP_DIR)/external/ode USER_PACKAGES+= $(TMP_DIR)/external/ePhysics
#include te generic toolchain : #include te generic toolchain :
include $(TMP_DIR)/build/Makefile.mk include $(TMP_DIR)/build/Makefile.mk

2
external/etk vendored

@ -1 +1 @@
Subproject commit 033c9dd63a75db8afb448760cdb59bc8f89d5e7a Subproject commit 74a6e35fa3de3bc5b2b0dc89992e6610db2014c2

1
external/ode vendored

@ -1 +0,0 @@
Subproject commit 7e4c9495b4688c4387402897922f0e258338a9ec

2
sources/Linux.mk
View File

@ -12,7 +12,7 @@ LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag)
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION)) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
# name of the dependency # 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 := LOCAL_C_INCLUDES :=

2
sources/ewol/game/Element.h
View File

@ -11,6 +11,8 @@
#include <etk/types.h> #include <etk/types.h>
#include <etk/math/Vector3D.h>
#include <etk/Vector.h>
#include <ewol/debug.h> #include <ewol/debug.h>
namespace game namespace game

1
sources/ewol/game/Engine.h
View File

@ -12,6 +12,7 @@
#include <etk/types.h> #include <etk/types.h>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/game/Element.h>
namespace game namespace game
{ {

12
sources/ewol/renderer/resources/Mesh.h
View File

@ -26,12 +26,12 @@ namespace ewol
int32_t m_GLColor; int32_t m_GLColor;
int32_t m_GLtexture; int32_t m_GLtexture;
int32_t m_GLtexID; int32_t m_GLtexID;
etk::Vector<uint32_t> m_indices; etk::Vector<uint32_t> m_indices;
etk::Vector< vec3 > m_vertices; etk::Vector< vec3 > m_vertices;
etk::Vector< vec2 > m_uvTextures; etk::Vector< vec2 > m_uvTextures;
etk::Vector< vec3 > m_normals; etk::Vector< vec3 > m_normals;
ewol::TextureFile* m_texture1; ewol::TextureFile* m_texture1;
etk::Vector<draw::Colorf> m_coordColor; //!< internal color of the different point etk::Vector<draw::Colorf> m_coordColor; //!< internal color of the different point
public: public:
Mesh(etk::UString genName); Mesh(etk::UString genName);
virtual ~Mesh(void); virtual ~Mesh(void);

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

@ -14,7 +14,7 @@
#undef __class__ #undef __class__
#define __class__ "Scene" #define __class__ "Scene"
widget::Scene::Scene(ewol::GameEngine* gameEngine) : widget::Scene::Scene(game::Engine* gameEngine) :
m_gameEngine(gameEngine), m_gameEngine(gameEngine),
m_isRunning(true), m_isRunning(true),
m_lastCallTime(-1) m_lastCallTime(-1)

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

@ -11,8 +11,10 @@
#include <etk/types.h> #include <etk/types.h>
#include <etk/math/Vector3D.h> #include <etk/math/Vector3D.h>
#include <etk/Vector.h>
#include <ewol/debug.h> #include <ewol/debug.h>
#include <ewol/game/Engine.h> #include <ewol/game/Engine.h>
#include <ewol/game/Element.h>
#include <ewol/widget/Widget.h> #include <ewol/widget/Widget.h>
@ -28,7 +30,7 @@ namespace widget {
* @brief Main scene constructor * @brief Main scene constructor
* @param[in] gameEngine Used game engine for the display (can be NULL). * @param[in] gameEngine Used game engine for the display (can be NULL).
*/ */
Scene(ewol::GameEngine* gameEngine=NULL); Scene(game::Engine* gameEngine=NULL);
/** /**
* @brief Destructor * @brief Destructor
* @note The engine is not destroy, it is the reponsability of the user * @note The engine is not destroy, it is the reponsability of the user

3
sources/file.mk
View File

@ -80,7 +80,8 @@ FILE_LIST+= ewol/widget/Widget.cpp \
# game mode area : # game mode area :
FILE_LIST+= ewol/widget/Scene.cpp \ 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 \ LOCAL_COPY_FILES := ../data/textured3D.prog:textured3D.prog \