edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

New glew try

Browse source
This commit is contained in:
Dennis Felsing 2017-10-20 11:35:44 +02:00
parent 88c0778b21
commit 5a75dc7f27
9 changed files with 5848 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -361,8 +361,11 @@ target_include_directories(png PRIVATE ${ZLIB_INCLUDEDIR})
set(DEP_PNG $<TARGET_OBJECTS:png>) set(DEP_PNG $<TARGET_OBJECTS:png>)
list(APPEND TARGETS_DEP png) list(APPEND TARGETS_DEP png)
set_glob(DEP_GLEW_SRC GLOB src/engine/external/glew glew.c glew.h) set_glob(DEP_GLEW_SRC GLOB src/engine/external/glew glew.c GL/glew.h
GL/eglew.h GL/glxew.h GL/wglew.h)
add_library(glew OBJECT EXCLUDE_FROM_ALL ${DEP_GLEW_SRC}) add_library(glew OBJECT EXCLUDE_FROM_ALL ${DEP_GLEW_SRC})
target_compile_definitions(glew PRIVATE GLEW_STATIC)
target_include_directories(glew PRIVATE src/engine/external/glew)
set(DEP_GLEW $<TARGET_OBJECTS:glew>) set(DEP_GLEW $<TARGET_OBJECTS:glew>)
list(APPEND TARGETS_DEP glew) list(APPEND TARGETS_DEP glew)

1
bam.lua
View file

@ -294,6 +294,7 @@ function build(settings)
end end
if platform ~= "macosx" then if platform ~= "macosx" then
external_settings.cc.defines:Add("GLEW_STATIC") external_settings.cc.defines:Add("GLEW_STATIC")
external_settings.cc.flags:Add("-I src/engine/external/glew")
glew = Compile(external_settings, Collect("src/engine/external/glew/*.c")) glew = Compile(external_settings, Collect("src/engine/external/glew/*.c"))
end end

2
src/engine/client/backend_sdl.cpp
View file

@ -10,7 +10,7 @@
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#include <OpenGL/gl3ext.h> #include <OpenGL/gl3ext.h>
#else #else
#include "engine/external/glew/glew.h" #include "engine/external/glew/GL/glew.h"
#endif #endif
#include <base/detect.h> #include <base/detect.h>

2
src/engine/client/opengl_sl.h
View file

@ -5,7 +5,7 @@
#if defined(CONF_PLATFORM_MACOSX) #if defined(CONF_PLATFORM_MACOSX)
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#else #else
#include "engine/external/glew/glew.h" #include "engine/external/glew/GL/glew.h"
#endif #endif
class CGLSL { class CGLSL {

2
src/engine/client/opengl_sl_program.h
View file

@ -5,7 +5,7 @@
#if defined(CONF_PLATFORM_MACOSX) #if defined(CONF_PLATFORM_MACOSX)
#include <OpenGL/gl3.h> #include <OpenGL/gl3.h>
#else #else
#include "engine/external/glew/glew.h" #include "engine/external/glew/GL/glew.h"
#endif #endif
class CGLSL; class CGLSL;

2618
src/engine/external/glew/GL/eglew.h vendored Normal file
View file

File diff suppressed because it is too large Load diff

0
src/engine/external/glew/glew.h → src/engine/external/glew/GL/glew.h vendored
View file

1775
src/engine/external/glew/GL/glxew.h vendored Normal file
View file

File diff suppressed because it is too large Load diff

1447
src/engine/external/glew/GL/wglew.h vendored Normal file
View file

File diff suppressed because it is too large Load diff