(DEV) first compilation on MacOsX ==> not work due to the X11 interoperability error

Makefile.mk

@@ -1,7 +1,6 @@
 
 # get the local dir in a good form :
-TMP_DIR := $(shell readlink -m -n $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))))
-
+TMP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 
 # Add ewol packages
 EWOL_FOLDER:=$(TMP_DIR)

build

@@ -1 +1 @@
-Subproject commit 57ef468e1cbca4e6a6c4a9804024e7a684017441
+Subproject commit 1177a53e86c62ce8ed9d74860ef4e9eefd97c287

external/bullet/Generic.mk

@@ -11,7 +11,7 @@ LOCAL_MODULE := linearmath
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/bullet/src/
 
 LOCAL_CFLAGS := -Wno-write-strings \
-                -DHAVE_CONFIG_H \
+                -DHAVE_CONFIG_H\
                 -O2
 
 LOCAL_SRC_FILES := \
@@ -43,7 +43,7 @@ LOCAL_C_INCLUDES :=  \
                     $(LOCAL_PATH)/bullet/Extras/ConvexDecomposition
 
 LOCAL_CFLAGS := -Wno-write-strings \
-                -DHAVE_CONFIG_H \
+                -DHAVE_CONFIG_H\
                 -O2
 
 

external/bullet/bullet

@@ -1 +1 @@
-Subproject commit 6930931f46f9846c6f4f7031e416205cd0fdb4b4
+Subproject commit 001054295728371e2a55ad33589867b3a07e3d11

sources/MacOs.mk

@@ -0,0 +1,55 @@
+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 libzip libpng parsersvg lua bullet
+
+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___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)

sources/ewol/renderer/os/gui.X11.cpp

@@ -24,7 +24,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#if defined(__TARGET_OS__Linux)
 #include <GL/glx.h>
+#elif defined(__TARGET_OS__MacOs)
+#include <OpenGL/glx.h>
+#endif
+
 #include <X11/Xatom.h>
 #include <sys/times.h>