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

compilation for windows done corectly with glew ==> need to be tested on a real windows to test it

Browse Source
This commit is contained in:
Edouard DUPIN 2012-08-30 18:32:31 +02:00
parent 6d488cb802
commit 936e10adac
9 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -31,3 +31,6 @@
[submodule "Sources/libz/zlib"] [submodule "Sources/libz/zlib"]
path = Sources/libz/zlib path = Sources/libz/zlib
url = https://github.com/madler/zlib.git url = https://github.com/madler/zlib.git
[submodule "Sources/libglew/glew"]
path = Sources/libglew/glew
url = https://github.com/HeeroYui/glew.git

2
Build

@ -1 +1 @@
Subproject commit 69605919a97aa8ccf82eef24b15f960f9c8ba7af Subproject commit be3793f0e962b61ecc9e98bdd461b413e652772e

13
Sources/libewol/Android.mk
View File

@ -17,16 +17,19 @@ LOCAL_C_INCLUDES :=
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_EXPORT_LDLIBS := -lGLESv2 -ldl -llog
#LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog
LOCAL_CFLAGS := -Wno-write-strings \ LOCAL_CFLAGS := -Wno-write-strings \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-DDATA_IN_APK -DDATA_IN_APK
ifeq ("$(SHADER)","1")
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_LDLIBS := -lGLESv2
else
LOCAL_EXPORT_LDLIBS := -lGLESv1_CM
endif
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 LOCAL_EXPORT_LDLIBS += -ldl -llog
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
# load the common sources file of the platform # load the common sources file of the platform
include $(LOCAL_PATH)/file.mk include $(LOCAL_PATH)/file.mk

8
Sources/libewol/Linux.mk
View File

@ -27,10 +27,10 @@ LOCAL_CFLAGS := -Wno-write-strings \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-Wall -Wall
ifeq ("$(SHADER)","1")
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2 LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2 LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
endif
# load the common sources file of the platform # load the common sources file of the platform
include $(LOCAL_PATH)/file.mk include $(LOCAL_PATH)/file.mk

8
Sources/libewol/Windows.mk
View File

@ -11,21 +11,17 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG)) $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency # name of the dependency
LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua zlib LOCAL_LIBRARIES := etk freetype tinyxml libzip libpng parsersvg lua zlib glew
LOCAL_C_INCLUDES := LOCAL_C_INCLUDES :=
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_EXPORT_LDLIBS := -lopengl32 -lgdi32 LOCAL_EXPORT_LDLIBS :=
LOCAL_CFLAGS := -Wno-write-strings \ LOCAL_CFLAGS := -Wno-write-strings \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \ -DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" \
-Wall -Wall
#LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
#LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
# load the common sources file of the platform # load the common sources file of the platform
include $(LOCAL_PATH)/file.mk include $(LOCAL_PATH)/file.mk

11
Sources/libewol/ewol/openGL/openGL.h
View File

@ -60,11 +60,14 @@ extern "C" {
#elif defined(__TARGET_OS__Windows) #elif defined(__TARGET_OS__Windows)
#ifdef __VIDEO__OPENGL_ES_2 #ifdef __VIDEO__OPENGL_ES_2
// TO ENABLE THE SHADER api ... // TO ENABLE THE SHADER api ...
#define GL_GLEXT_PROTOTYPES //#define GL_GLEXT_PROTOTYPES
#define GLEW_STATIC
#include <GL/glew.h>
#else
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glext.h>
#endif #endif
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glext.h>
#elif defined(__TARGET_OS__MacOs) #elif defined(__TARGET_OS__MacOs)
#elif defined(__TARGET_OS__IOs) #elif defined(__TARGET_OS__IOs)

8
Sources/libewol/ewol/os/gui.Windows.cpp
View File

@ -211,6 +211,14 @@ int Windows_Run(void);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef __VIDEO__OPENGL_ES_2
glewInit();
if (!glewIsSupported("GL_VERSION_2_0")) {
fprintf(stderr, "OpenGL 2.0 not available\n");
return 1;
}
#endif
ewol::CmdLine::Clean(); ewol::CmdLine::Clean();
for( int32_t i=1 ; i<argc; i++) { for( int32_t i=1 ; i<argc; i++) {
EWOL_INFO("CmdLine : \"" << argv[i] << "\"" ); EWOL_INFO("CmdLine : \"" << argv[i] << "\"" );

18
Sources/libglew/Windows.mk Normal file
View File

@ -0,0 +1,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := glew
#http://glew.sourceforge.net/index.html
ifeq ("$(SHADER)","1")
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/glew/include/
LOCAL_EXPORT_LDLIBS := $(LOCAL_PATH)/glew/lib/glew32s.lib -lopengl32 -lgdi32
# to enable open gl 2 mode
LOCAL_CFLAGS += -D__VIDEO__OPENGL_ES_2
LOCAL_EXPORT_CFLAGS := -D__VIDEO__OPENGL_ES_2
endif
include $(BUILD_PREBUILT)

1
Sources/libglew/glew Submodule

@ -0,0 +1 @@
Subproject commit 76748293c2611769297c2c97ed96dde8368bbbf0