diff --git a/Makefile.mk b/Makefile.mk deleted file mode 100644 index 5924a3f2..00000000 --- a/Makefile.mk +++ /dev/null @@ -1,24 +0,0 @@ - -# get the local dir in a good form : -TMP_DIR := $(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/bullet -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 diff --git a/build b/build index 810f699b..d3545a7e 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 810f699b6c58a82381b7291faba0db76048d83ff +Subproject commit d3545a7e5c6b531e6c00e8213d8a93e0ebb5794d diff --git a/external/agg b/external/agg index 2f0d060a..03d4b447 160000 --- a/external/agg +++ b/external/agg @@ -1 +1 @@ -Subproject commit 2f0d060a19a19322d0d2a3ec18da9a731c678b2b +Subproject commit 03d4b44747b9afa4523819d5cb2813bc6c032b51 diff --git a/external/bullet/Generic.mk b/external/bullet/Generic.mk deleted file mode 100644 index 59e46ed8..00000000 --- a/external/bullet/Generic.mk +++ /dev/null @@ -1,55 +0,0 @@ - -# -------------------------------------------------------- -# -- Linear Math librairy -# -------------------------------------------------------- -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := linearmath - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/bullet/src/ - -LOCAL_CFLAGS := -Wno-write-strings \ - -DHAVE_CONFIG_H\ - -O2 - -LOCAL_SRC_FILES := \ - bullet/src/LinearMath/btQuickprof.cpp \ - bullet/src/LinearMath/btGeometryUtil.cpp \ - bullet/src/LinearMath/btAlignedAllocator.cpp \ - bullet/src/LinearMath/btSerializer.cpp \ - bullet/src/LinearMath/btConvexHull.cpp \ - bullet/src/LinearMath/btPolarDecomposition.cpp \ - bullet/src/LinearMath/btVector3.cpp \ - bullet/src/LinearMath/btConvexHullComputer.cpp - -include $(BUILD_STATIC_LIBRARY) - - -# -------------------------------------------------------- -# -- Bullet librairy -# -------------------------------------------------------- -include $(CLEAR_VARS) - -LOCAL_MODULE := bullet - -LOCAL_LIBRARIES := linearmath - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/bullet/src/ - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/bullet/Extras/ConvexDecomposition - -LOCAL_CFLAGS := -Wno-write-strings \ - -DHAVE_CONFIG_H\ - -O2 - - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -LOCAL_SRC_FILES := $(FILE_LIST) - -include $(BUILD_STATIC_LIBRARY) diff --git a/external/bullet/file.mk b/external/bullet/file.mk deleted file mode 100644 index e18f7844..00000000 --- a/external/bullet/file.mk +++ /dev/null @@ -1,161 +0,0 @@ - -# lib BulletCollision -FILE_LIST:= \ - bullet/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp \ - bullet/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btGhostObject.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btUnionFind.cpp \ - bullet/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btShapeHull.cpp \ - bullet/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btCompoundShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConeShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp \ - bullet/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btSphereShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp \ - bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp \ - bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btEmptyShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btCollisionShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleCallback.cpp \ - bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConcaveShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btBoxShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btBox2dShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp \ - bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btCylinderShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp \ - bullet/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp \ - bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btDbvt.cpp \ - bullet/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp \ - bullet/src/BulletCollision/Gimpact/btGImpactBvh.cpp \ - bullet/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp \ - bullet/src/BulletCollision/Gimpact/btTriangleShapeEx.cpp \ - bullet/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp \ - bullet/src/BulletCollision/Gimpact/btGImpactShape.cpp \ - bullet/src/BulletCollision/Gimpact/gim_box_set.cpp \ - bullet/src/BulletCollision/Gimpact/gim_contact.cpp \ - bullet/src/BulletCollision/Gimpact/gim_memory.cpp \ - bullet/src/BulletCollision/Gimpact/gim_tri_collision.cpp - - - -# lib BulletDynamics -FILE_LIST+= \ - bullet/src/BulletDynamics/Dynamics/btRigidBody.cpp \ - bullet/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp \ - bullet/src/BulletDynamics/Dynamics/Bullet-C-API.cpp \ - bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp \ - bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp \ - bullet/src/BulletDynamics/Vehicle/btWheelInfo.cpp \ - bullet/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp \ - bullet/src/BulletDynamics/Character/btKinematicCharacterController.cpp - - -# lib BulletSoftBody -FILE_LIST+= \ - bullet/src/BulletSoftBody/btDefaultSoftBodySolver.cpp \ - bullet/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp \ - bullet/src/BulletSoftBody/btSoftBody.cpp \ - bullet/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp \ - bullet/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp \ - bullet/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp \ - bullet/src/BulletSoftBody/btSoftBodyHelpers.cpp \ - bullet/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp - -# lib gimpactutils -FILE_LIST+= \ - bullet/Extras/GIMPACTUtils/btGImpactConvexDecompositionShape.cpp - -# lib convexdecomposition -#FILE_LIST+= \ - bullet/Extras/ConvexDecomposition/concavity.cpp \ - bullet/Extras/ConvexDecomposition/ConvexDecomposition.cpp \ - bullet/Extras/ConvexDecomposition/vlookup.cpp \ - bullet/Extras/ConvexDecomposition/bestfit.cpp \ - bullet/Extras/ConvexDecomposition/ConvexBuilder.cpp \ - bullet/Extras/ConvexDecomposition/cd_hull.cpp \ - bullet/Extras/ConvexDecomposition/raytri.cpp \ - bullet/Extras/ConvexDecomposition/splitplane.cpp \ - bullet/Extras/ConvexDecomposition/float_math.cpp \ - bullet/Extras/ConvexDecomposition/planetri.cpp \ - bullet/Extras/ConvexDecomposition/cd_wavefront.cpp \ - bullet/Extras/ConvexDecomposition/bestfitobb.cpp \ - bullet/Extras/ConvexDecomposition/meshvolume.cpp \ - bullet/Extras/ConvexDecomposition/fitsphere.cpp - - -# lib HACD -#FILE_LIST+= \ - bullet/Extras/HACD/hacdGraph.cpp \ - bullet/Extras/HACD/hacdHACD.cpp \ - bullet/Extras/HACD/hacdICHull.cpp \ - bullet/Extras/HACD/hacdManifoldMesh.cpp - - diff --git a/external/etk b/external/etk index 4f761c47..445d2cf4 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 4f761c4705abf7e2688f670e1117e2f18f4c7379 +Subproject commit 445d2cf41b0825147176562edc6c621b96db7ac3 diff --git a/external/freetype b/external/freetype index a1a17000..d3adbca4 160000 --- a/external/freetype +++ b/external/freetype @@ -1 +1 @@ -Subproject commit a1a17000ea26b821c0fbf59e93b8af05a3794ba0 +Subproject commit d3adbca45b32e33e9834c359fac5308e96769bd7 diff --git a/external/glew/Windows.mk b/external/glew/Windows.mk deleted file mode 100644 index ec7ca03f..00000000 --- a/external/glew/Windows.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := glew - -#http://glew.sourceforge.net/index.html - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/glew/include/ -LOCAL_EXPORT_LDLIBS := $(LOCAL_PATH)/glew/lib/glew32s.lib -lopengl32 -lgdi32 - -include $(BUILD_PREBUILT) - diff --git a/external/lua b/external/lua index 8f69687b..7feb8485 160000 --- a/external/lua +++ b/external/lua @@ -1 +1 @@ -Subproject commit 8f69687bf30e39caf2971085d3680fdbc08e1d04 +Subproject commit 7feb84850902ed0e3352d5f486803abf16de503d diff --git a/external/ogg b/external/ogg index ceb0a9a5..618dd74f 160000 --- a/external/ogg +++ b/external/ogg @@ -1 +1 @@ -Subproject commit ceb0a9a5b73231278bb59923b5477cb128c1d432 +Subproject commit 618dd74f930fd68d859dd0e2412dc4654bc580b1 diff --git a/external/parsersvg b/external/parsersvg index 2c7acec0..4c0e4fb8 160000 --- a/external/parsersvg +++ b/external/parsersvg @@ -1 +1 @@ -Subproject commit 2c7acec000904696a65f565a195560242d2e5a60 +Subproject commit 4c0e4fb83626a3ce7c494e2beb1e0733a42be25e diff --git a/external/png b/external/png index 6ae3654a..9e3234a2 160000 --- a/external/png +++ b/external/png @@ -1 +1 @@ -Subproject commit 6ae3654a11cb8e409c8620dc1277a68582c8ed82 +Subproject commit 9e3234a26908a87680f51bbea83342ed2e579451 diff --git a/external/portaudio b/external/portaudio index 466560eb..6c815e5a 160000 --- a/external/portaudio +++ b/external/portaudio @@ -1 +1 @@ -Subproject commit 466560ebeacdddfb83fbe22ad86bff77e2cb19d7 +Subproject commit 6c815e5adec48a48a9b22b6bc61c5c91ab22b055 diff --git a/external/tinyxml b/external/tinyxml index 9a583d46..b84598db 160000 --- a/external/tinyxml +++ b/external/tinyxml @@ -1 +1 @@ -Subproject commit 9a583d464fdce0870bbda1f09b212ee16db7abf9 +Subproject commit b84598db9298a13c6667a2e8680f126e39af1636 diff --git a/external/z/Generic.mk b/external/z/Generic.mk deleted file mode 100644 index 93d408fb..00000000 --- a/external/z/Generic.mk +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := zlib - -LOCAL_EXPORT_LDLIBS := -lz - -include $(BUILD_PREBUILT) diff --git a/external/z/Windows.mk b/external/z/Windows.mk deleted file mode 100644 index dac3ba71..00000000 --- a/external/z/Windows.mk +++ /dev/null @@ -1,19 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := zlib - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/zlib - -LOCAL_CFLAGS := -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -LOCAL_SRC_FILES := $(FILE_LIST) - -LOCAL_LDLIBS := - -include $(BUILD_STATIC_LIBRARY) - diff --git a/external/z/file.mk b/external/z/file.mk deleted file mode 100644 index 89a34d63..00000000 --- a/external/z/file.mk +++ /dev/null @@ -1,18 +0,0 @@ - -FILE_LIST = zlib/adler32.c \ - zlib/crc32.c \ - zlib/deflate.c \ - zlib/infback.c \ - zlib/inffast.c \ - zlib/inflate.c \ - zlib/inftrees.c \ - zlib/trees.c \ - zlib/zutil.c \ - zlib/compress.c \ - zlib/uncompr.c \ - zlib/gzclose.c \ - zlib/gzlib.c \ - zlib/gzread.c \ - zlib/gzwrite.c - - diff --git a/external/zip b/external/zip index 53db794d..0aad7cf3 160000 --- a/external/zip +++ b/external/zip @@ -1 +1 @@ -Subproject commit 53db794da5e165e25ebb096374637f8883f59e3d +Subproject commit 0aad7cf374a60934d3cfe759f7858d4a4de47472 diff --git a/sources/Android.mk b/sources/Android.mk deleted file mode 100644 index ebd05166..00000000 --- a/sources/Android.mk +++ /dev/null @@ -1,73 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# name of the librairy -LOCAL_MODULE := ewol - -LOCAL_CONFIG_FILES := Config.in ConfigAndroid.in - -# get the tag of the current project : -LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag) -$(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) - -LOCAL_CFLAGS := -Wno-write-strings \ - -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG)-$(BUILD_DIRECTORY_MODE)\"" \ - -DDATA_IN_APK \ - -O2 - -#LOCAL_EXPORT_CFLAGS := -DBT_USE_NEON - -LOCAL_EXPORT_LDLIBS := -lGLESv2 - -LOCAL_EXPORT_LDLIBS += -ldl -llog - - -FILE_ABSTRACTION:=$(LOCAL_PATH)/ewol/renderer/os/gui.Android.base.cpp -FILE_ABSTRACTION_DEST:=ewol/renderer/os/gui.Android.tmp.cpp - -EWOL_TMP_PATH:=$(LOCAL_PATH) - -$(shell rm -f $(LOCAL_PATH)/$(FILE_ABSTRACTION_DEST)) - -$(LOCAL_PATH)/$(FILE_ABSTRACTION_DEST): $(FILE_ABSTRACTION) - $(Q)mkdir -p $(dir $@) - $(Q)cp -f $(FILE_ABSTRACTION) $@ - $(Q)sed -i "s|__PROJECT_ORG_TYPE__|$(PROJECT_COMPAGNY_TYPE)|" $@ - $(Q)sed -i "s|__PROJECT_VENDOR__|$(PROJECT_COMPAGNY_NAME2)|" $@ - $(Q)sed -i "s|__PROJECT_NAME__|$(PROJECT_NAME2)|" $@ - $(Q)sed -i "s|__PROJECT_PACKAGE__|$(PROJECT_NAME2)|" $@ - -$(FILE_ABSTRACTION_DEST): $(LOCAL_PATH)/$(FILE_ABSTRACTION_DEST) - - - -# this is the abstraction file for Android -LOCAL_PREREQUISITES := $(FILE_ABSTRACTION_DEST) - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -LOCAL_SRC_FILES := ewol/renderer/os/gui.Android.cpp $(FILE_LIST) - -include $(BUILD_STATIC_LIBRARY) - - diff --git a/sources/Linux.mk b/sources/Linux.mk deleted file mode 100644 index b6de56b6..00000000 --- a/sources/Linux.mk +++ /dev/null @@ -1,68 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# name of the librairy -LOCAL_MODULE := ewol - -LOCAL_CONFIG_FILES := Config.in ConfigLinux.in - -# get the tag of the current project : -LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag) -$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION)) - -# name of the dependency -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 := - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -lGL - -#`pkg-config --cflags directfb` `pkg-config --libs directfb` - -ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_X11__)","y") -LOCAL_EXPORT_LDLIBS += -lX11 -endif -ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_DIRECT_FB__)","y") -LOCAL_EXPORT_LDLIBS += -L/usr/local/lib -ldirectfb -lfusion -ldirect -endif - -#http://en.wikibooks.org/wiki/OpenGL_Programming/Modern_OpenGL_Introduction -# needed package on linux : libgl1-mesa-dev libglew1.5-dev - - -LOCAL_CFLAGS := -Wno-write-strings \ - -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG)-$(BUILD_DIRECTORY_MODE)\"" \ - -Wall - -LOCAL_EXPORT_CFLAGS := - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -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 -endif -ifeq ("$(CONFIG___EWOL_LINUX_GUI_MODE_DIRECT_FB__)","y") -LOCAL_CFLAGS += -I/usr/local/include/directfb -LOCAL_SRC_FILES += ewol/renderer/os/gui.directFB.cpp -endif - - -include $(BUILD_STATIC_LIBRARY) diff --git a/sources/MacOs.mk b/sources/MacOs.mk deleted file mode 100644 index 7c17ea50..00000000 --- a/sources/MacOs.mk +++ /dev/null @@ -1,102 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# name of the librairy -LOCAL_MODULE := ewol - -LOCAL_CONFIG_FILES := Config.in ConfigLinux.in - -# get the tag of the current project : -LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/tag) -$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION)) - -# name of the dependency -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 := - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -framework Cocoa -framework OpenGL -framework QuartzCore -framework AppKit - -LOCAL_CFLAGS := -Wno-write-strings \ - -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG)-$(BUILD_DIRECTORY_MODE)\"" \ - -Wall - -LOCAL_EXPORT_CFLAGS := - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -LOCAL_SRC_FILES := $(FILE_LIST) - -LOCAL_SRC_FILES += ewol/renderer/os/gui.MacOs.cpp \ - ewol/renderer/os/gui.MacOs.Interface.mm \ - ewol/renderer/os/gui.MacOs.AppDelegate.mm \ - ewol/renderer/os/gui.MacOs.OpenglView.mm - -# xcode compilation exemple sources : -## basic truchage -#ProcessInfoPlistFile /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Info.plist basicWindowsTestInOpenGL/basicWindowsTestInOpenGL-Info.plist -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#builtin-infoPlistUtility basicWindowsTestInOpenGL/basicWindowsTestInOpenGL-Info.plist -genpkginfo /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/PkgInfo -expandbuildsettings -platform macosx -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Info.plist - -## precompile je sais pas trop.pch -#ProcessPCH /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch.pth basicWindowsTestInOpenGL/basicWindowsTestInOpenGL-Prefix.pch normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#setenv LANG en_US.US-ASCII -#/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c-header -arch x86_64 -fmessage-length=0 -std=gnu99 -fobjc-arc -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wreturn-type -Wno-implicit-atomic-properties -Wno-receiver-is-weak -Wduplicate-method-match -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wenum-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DDEBUG=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -mmacosx-version-min=10.8 -g -Wno-sign-conversion -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-generated-files.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-own-target-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-all-target-headers.hmap -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-project-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources/x86_64 -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources -F/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug --serialize-diagnostics /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch.dia -c /Users/edouarddupin/dev/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL-Prefix.pch -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch.pth -MMD -MT dependencies -MF /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch.d - -# compile main.m -#CompileC /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/main.o basicWindowsTestInOpenGL/main.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#setenv LANG en_US.US-ASCII -#/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -arch x86_64 -fmessage-length=0 -std=gnu99 -fobjc-arc -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wreturn-type -Wno-implicit-atomic-properties -Wno-receiver-is-weak -Wduplicate-method-match -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wenum-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DDEBUG=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -mmacosx-version-min=10.8 -g -Wno-sign-conversion -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-generated-files.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-own-target-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-all-target-headers.hmap -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-project-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources/x86_64 -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources -F/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug -include /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch -MMD -MT dependencies -MF /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/main.d --serialize-diagnostics /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/main.dia -c /Users/edouarddupin/dev/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL/main.m -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/main.o - -## compile app delegates -#CompileC /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/AppDelegate.o basicWindowsTestInOpenGL/AppDelegate.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#setenv LANG en_US.US-ASCII -#/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -arch x86_64 -fmessage-length=0 -std=gnu99 -fobjc-arc -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wreturn-type -Wno-implicit-atomic-properties -Wno-receiver-is-weak -Wduplicate-method-match -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wenum-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector -Wno-deprecated-implementations -DDEBUG=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -mmacosx-version-min=10.8 -g -Wno-sign-conversion -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-generated-files.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-own-target-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-all-target-headers.hmap -iquote /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/basicWindowsTestInOpenGL-project-headers.hmap -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources/x86_64 -I/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/DerivedSources -F/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug -include /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/PrecompiledHeaders/basicWindowsTestInOpenGL-Prefix-apbwwwblavjitifkwqsuuwvalavo/basicWindowsTestInOpenGL-Prefix.pch -MMD -MT dependencies -MF /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/AppDelegate.d --serialize-diagnostics /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/AppDelegate.dia -c /Users/edouarddupin/dev/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL/AppDelegate.m -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/AppDelegate.o - -# ld : -#Ld /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/MacOS/basicWindowsTestInOpenGL normal x86_64 -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#setenv MACOSX_DEPLOYMENT_TARGET 10.8 -#/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -L/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug -F/Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug -filelist /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Intermediates/basicWindowsTestInOpenGL.build/Debug/basicWindowsTestInOpenGL.build/Objects-normal/x86_64/basicWindowsTestInOpenGL.LinkFileList -mmacosx-version-min=10.8 -fobjc-arc -fobjc-link-runtime -framework Cocoa -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/MacOS/basicWindowsTestInOpenGL - -## copy basic string -#CopyStringsFile /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Resources/en.lproj/InfoPlist.strings basicWindowsTestInOpenGL/en.lproj/InfoPlist.strings -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#builtin-copyStrings --validate --inputencoding utf-8 --outputencoding UTF-16 --outdir /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Resources/en.lproj -- basicWindowsTestInOpenGL/en.lproj/InfoPlist.strings - -## copy credit -#CpResource basicWindowsTestInOpenGL/en.lproj/Credits.rtf /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Resources/en.lproj/Credits.rtf -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/edouarddupin/dev/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL/en.lproj/Credits.rtf /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Resources/en.lproj - -## create main menu xib -#CompileXIB basicWindowsTestInOpenGL/en.lproj/MainMenu.xib -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#setenv XCODE_DEVELOPER_USR_PATH /Applications/Xcode.app/Contents/Developer/usr/bin/.. -#/Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --output-format human-readable-text --compile /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app/Contents/Resources/en.lproj/MainMenu.nib /Users/edouarddupin/dev/basicWindowsTestInOpenGL/basicWindowsTestInOpenGL/en.lproj/MainMenu.xib --sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk - -## touche app -#Touch /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app -#cd /Users/edouarddupin/dev/basicWindowsTestInOpenGL -#/usr/bin/touch -c /Users/edouarddupin/Library/Developer/Xcode/DerivedData/basicWindowsTestInOpenGL-aqlzuzmwjgolzcctybifonzjwojs/Build/Products/Debug/basicWindowsTestInOpenGL.app - - -include $(BUILD_STATIC_LIBRARY) diff --git a/sources/Windows.mk b/sources/Windows.mk deleted file mode 100644 index 3c6c4f35..00000000 --- a/sources/Windows.mk +++ /dev/null @@ -1,33 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# name of the librairy -LOCAL_MODULE := ewol - -LOCAL_CONFIG_FILES := Config.in - -# get the tag of the current project : -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 zlib glew bullet - -LOCAL_C_INCLUDES := - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := - -LOCAL_CFLAGS := -Wno-write-strings \ - -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG)-$(BUILD_DIRECTORY_MODE)\"" \ - -Wall - -# load the common sources file of the platform -include $(LOCAL_PATH)/file.mk - -LOCAL_SRC_FILES := $(FILE_LIST) ewol/renderer/os/gui.Windows.cpp - - - -include $(BUILD_STATIC_LIBRARY) diff --git a/sources/file.mk b/sources/file.mk deleted file mode 100644 index 384aee77..00000000 --- a/sources/file.mk +++ /dev/null @@ -1,111 +0,0 @@ - -# Basic elements -FILE_LIST:= ewol/ewol.cpp \ - ewol/clipBoard.cpp \ - ewol/debug.cpp \ - ewol/config.cpp \ - ewol/commandLine.cpp \ - ewol/key.cpp \ - ewol/cursor.cpp \ - ewol/Dimension.cpp - -# Basic Eobject of EWOL -FILE_LIST+= ewol/eObject/EObject.cpp \ - ewol/eObject/EObjectManager.cpp - -#openGl Basic access abstraction (for the model matrix and include -FILE_LIST+= ewol/renderer/openGL.cpp \ - ewol/renderer/Light.cpp \ - ewol/renderer/Material.cpp - -# Operating System interface -FILE_LIST+= ewol/renderer/os/eSystem.cpp \ - ewol/renderer/os/eSystemInput.cpp - -# renderer : -FILE_LIST+= ewol/renderer/resources/Shader.cpp \ - ewol/renderer/resources/Program.cpp \ - ewol/renderer/resources/VirtualBufferObject.cpp \ - ewol/renderer/resources/ConfigFile.cpp \ - ewol/renderer/resources/FontFreeType.cpp \ - ewol/renderer/resources/TexturedFont.cpp \ - ewol/renderer/resources/Mesh.cpp \ - ewol/renderer/resources/MeshObj.cpp \ - ewol/renderer/resources/Texture.cpp \ - ewol/renderer/resources/Colored3DObject.cpp \ - ewol/renderer/resources/Image.cpp \ - ewol/renderer/resources/image/ImageBMP.cpp \ - ewol/renderer/resources/image/ImagePNG.cpp \ - ewol/renderer/ResourceManager.cpp - -# Audio system -FILE_LIST+= ewol/renderer/audio/audio.cpp \ - ewol/renderer/audio/decWav.cpp - -# Compositing -FILE_LIST+= ewol/compositing/Compositing.cpp \ - ewol/compositing/Text.cpp \ - ewol/compositing/Drawing.cpp \ - ewol/compositing/Image.cpp \ - ewol/compositing/Sprite.cpp \ - ewol/compositing/Mesh.cpp \ - ewol/compositing/Shaper.cpp \ - ewol/compositing/Area.cpp - - -# all widgets -FILE_LIST+= ewol/widget/Widget.cpp \ - ewol/widget/WidgetManager.cpp \ - ewol/widget/Windows.cpp \ - ewol/widget/Button.cpp \ - ewol/widget/Gird.cpp \ - ewol/widget/Image.cpp \ - ewol/widget/ButtonColor.cpp \ - ewol/widget/CheckBox.cpp \ - ewol/widget/ColorBar.cpp \ - ewol/widget/ContextMenu.cpp \ - ewol/widget/Composer.cpp \ - ewol/widget/Container.cpp \ - ewol/widget/ContainerN.cpp \ - ewol/widget/Drawable.cpp \ - ewol/widget/Entry.cpp \ - ewol/widget/Joystick.cpp \ - ewol/widget/Label.cpp \ - ewol/widget/List.cpp \ - ewol/widget/ListFileSystem.cpp \ - ewol/widget/Layer.cpp \ - ewol/widget/Menu.cpp \ - ewol/widget/Mesh.cpp \ - ewol/widget/PopUp.cpp \ - ewol/widget/ProgressBar.cpp \ - ewol/widget/Sizer.cpp \ - ewol/widget/Slider.cpp \ - ewol/widget/WSlider.cpp \ - ewol/widget/Spacer.cpp \ - ewol/widget/WidgetScrolled.cpp \ - ewol/widget/meta/FileChooser.cpp \ - ewol/widget/meta/ColorChooser.cpp \ - ewol/widget/meta/Parameter.cpp \ - ewol/widget/meta/ParameterList.cpp - -# game mode area : -FILE_LIST+= ewol/widget/Scene.cpp \ - ewol/game/Camera.cpp - - -LOCAL_COPY_FOLDERS := ../data/theme/default/widgetEntry.*:theme/default \ - ../data/theme/rounded/widgetEntry.*:theme/rounded \ - ../data/theme/default/widgetButton.*:theme/default \ - ../data/theme/rounded/widgetButton.*:theme/rounded \ - ../data/textured.*: \ - ../data/texturedNoMaterial.*: \ - ../data/text.*: \ - ../data/simple3D.*: \ - ../data/color.*: \ - ../data/color3.*: \ - ../data/textured3D2.*: \ - ../data/textured3D.*: - - - -