josh/superbible
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from procedural/linux-fixes

Browse Source 
Fixes for Linux
This commit is contained in:
Graham Sellers
2015-07-24 19:10:46 -04:00
parent e5b7401df7 1c0403a2f7
commit 3f80b7a829
7 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
bin/
build/
*.txt.user

6
CMakeLists.txt
View File

@@ -23,7 +23,9 @@ set (CMAKE_DEBUG_POSTFIX "_d")
if(WIN32)
set(COMMON_LIBS sb7 optimized glfw3 debug glfw3_d ${GLFW_LIBRARIES} ${OPENGL_LIBRARIES})
elseif (UNIX)
set(COMMON_LIBS sb7 glfw3 ${GLFW_LIBRARIES} rt dl)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLFW REQUIRED glfw3)
set(COMMON_LIBS sb7 glfw3 X11 Xrandr Xinerama Xi Xxf86vm Xcursor GL rt dl)
else()
set(COMMON_LIBS sb7)
endif()
@@ -144,7 +146,7 @@ foreach(EXAMPLE ${EXAMPLES})
endforeach(EXAMPLE)
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LINUX")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LINUX -std=c++0x")
ENDIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
include_directories( include )

3
include/sb7.h
View File

@@ -32,6 +32,9 @@
#define WIN32_LEAN_AND_MEAN 1
#include <Windows.h>
#else
#include <unistd.h>
#define Sleep(t) sleep(t)
#endif
#include "GL/gl3w.h"

2
include/sb7ext.h
View File

@@ -28,7 +28,7 @@
#include "GL/glext.h"
void * sb6GetProcAddress(const char * funcname);
GL3WglProc sb6GetProcAddress(const char * funcname);
int sb6IsExtensionSupported(const char * extname);
#endif /* __SB6EXT_H__ */

8
src/dflandscape/dflandscape.cpp
View File

@@ -133,14 +133,14 @@ public:
GLuint fs;
};
GLuint shaders[2];
};
} shader;
vs = sb7::shader::load("media/shaders/dflandscape/dflandscape.vs.glsl", GL_VERTEX_SHADER);
fs = sb7::shader::load("media/shaders/dflandscape/dflandscape.fs.glsl", GL_FRAGMENT_SHADER);
shader.vs = sb7::shader::load("media/shaders/dflandscape/dflandscape.vs.glsl", GL_VERTEX_SHADER);
shader.fs = sb7::shader::load("media/shaders/dflandscape/dflandscape.fs.glsl", GL_FRAGMENT_SHADER);
glDeleteProgram(sdf_program);
sdf_program = sb7::program::link_from_shaders(shaders, 2, true);
sdf_program = sb7::program::link_from_shaders(shader.shaders, 2, true);
GLint foo = glGetUniformLocation(sdf_program, "uv_transform");
}

2
src/sb7/sb7.cpp
View File

@@ -31,7 +31,7 @@ sb7::application * sb7::application::app = 0;
#include <string.h>
void * sb6GetProcAddress(const char * funcname)
GL3WglProc sb6GetProcAddress(const char * funcname)
{
return gl3wGetProcAddress(funcname);
}

8
src/sdfdemo/sdfdemo.cpp
View File

@@ -146,12 +146,12 @@ public:
GLuint fs;
};
GLuint shaders[2];
};
} shader;
vs = sb7::shader::load("media/shaders/sdfdemo/sdf.vs.glsl", GL_VERTEX_SHADER);
fs = sb7::shader::load("media/shaders/sdfdemo/sdf.fs.glsl", GL_FRAGMENT_SHADER);
shader.vs = sb7::shader::load("media/shaders/sdfdemo/sdf.vs.glsl", GL_VERTEX_SHADER);
shader.fs = sb7::shader::load("media/shaders/sdfdemo/sdf.fs.glsl", GL_FRAGMENT_SHADER);
sdf_program = sb7::program::link_from_shaders(shaders, 2, true);
sdf_program = sb7::program::link_from_shaders(shader.shaders, 2, true);
GLint foo = glGetUniformLocation(sdf_program, "uv_transform");
}