reemo/sockscape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

woomy

Browse source
This commit is contained in:
malloc 2018-08-23 01:43:45 -05:00
parent 3eec99589d
commit b1331e7863
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -9,12 +9,12 @@ endif()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -static") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif() endif()
## CLIENT BUILD ## ## CLIENT BUILD ##
find_package(OPENGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(SDL2_image REQUIRED) find_package(SDL2_image REQUIRED)

4
src/client/main.cpp
View file

@ -12,8 +12,10 @@ void setColor(float r, float g, float b, SDL_Window* window) {
} }
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if(SDL_Init(SDL_INIT_VIDEO) < 0) if(SDL_Init(SDL_INIT_VIDEO) < 0) {
printf(SDL_GetError());
return -1; return -1;
}
atexit(SDL_Quit); atexit(SDL_Quit);
auto window = SDL_CreateWindow( auto window = SDL_CreateWindow(

4
src/client/shaders/_shader.hpp
View file

@ -48,11 +48,11 @@ public:
bool Load(); bool Load();
void Start() const; void Start() const;
inline GLint operator[] (std::vector::size_type index) { inline GLint operator[] (std::vector<GLint>::size_type index) {
return locations[index]; return locations[index];
} }
inline GLint Uniform(std::vector::size_type index) { inline GLint Uniform(std::vector<GLint>::size_type index) {
return locations[index]; return locations[index];
} }

1
src/common/crypto/base64.hpp
View file

@ -1,5 +1,6 @@
#ifndef SOSC_CRYPTO_BASE64 #ifndef SOSC_CRYPTO_BASE64
#define SOSC_CRYPTO_BASE64 #define SOSC_CRYPTO_BASE64
#undef unix
#include <vector> #include <vector>
#include <string> #include <string>

1
src/common/utils/time.hpp
View file

@ -1,5 +1,6 @@
#ifndef SOSC_UTIL_TIME_H #ifndef SOSC_UTIL_TIME_H
#define SOSC_UTIL_TIME_H #define SOSC_UTIL_TIME_H
#undef unix
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>