Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • STJr/UltimateZoneBuilder
  • KartKrew/high-voltage-ring
  • ashi/ultimate-zone-builder
  • Alam/UltimateZoneBuilder
  • Indev/UltimateZoneBuilder
  • Acelite/UltimateZoneBuilder
  • LoganAir/high-voltage-ring
  • coatlessali/high-voltage-ring
  • spherallic/high-voltage-ring
  • EeveeEuphoria/high-voltage-ring
  • StarManiaKG/the-story-of-horsepowering-vetted-racing
  • frostu8/high-voltage-ring
  • Benji_Menji/high-voltage-ring
  • Nep2Disk/UltimateZoneBuilder
  • PencilVoid/high-voltage-ring
15 results
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 34792d70
...@@ -210,7 +210,7 @@ i386: ...@@ -210,7 +210,7 @@ i386:
variables: variables:
CC: ccache i686-linux-gnu-gcc CC: ccache i686-linux-gnu-gcc
CXX: ccache i686-linux-gnu-g++ CXX: ccache i686-linux-gnu-g++
CPPFLAGS: -msse2 -Werror CPPFLAGS: -msse2
artifacts: artifacts:
paths: paths:
...@@ -249,7 +249,6 @@ amd64: ...@@ -249,7 +249,6 @@ amd64:
variables: variables:
CC: ccache x86_64-linux-gnu-gcc CC: ccache x86_64-linux-gnu-gcc
CXX: ccache x86_64-linux-gnu-gcc CXX: ccache x86_64-linux-gnu-gcc
CPPFLAGS: -Werror
artifacts: artifacts:
paths: paths:
...@@ -288,7 +287,6 @@ arm64: ...@@ -288,7 +287,6 @@ arm64:
variables: variables:
CC: ccache aarch64-linux-gnu-gcc CC: ccache aarch64-linux-gnu-gcc
CXX: ccache aarch64-linux-gnu-g++ CXX: ccache aarch64-linux-gnu-g++
CPPFLAGS: -Werror
artifacts: artifacts:
paths: paths:
...@@ -327,7 +325,6 @@ win32: ...@@ -327,7 +325,6 @@ win32:
variables: variables:
CC: ccache i686-w64-mingw32-gcc-posix CC: ccache i686-w64-mingw32-gcc-posix
CXX: ccache i686-w64-mingw32-g++-posix CXX: ccache i686-w64-mingw32-g++-posix
CPPFLAGS: -Werror
artifacts: artifacts:
paths: paths:
...@@ -358,7 +355,6 @@ win64: ...@@ -358,7 +355,6 @@ win64:
variables: variables:
CC: ccache x86_64-w64-mingw32-gcc-posix CC: ccache x86_64-w64-mingw32-gcc-posix
CXX: ccache x86_64-w64-mingw32-g++-posix CXX: ccache x86_64-w64-mingw32-g++-posix
CPPFLAGS: -Werror
artifacts: artifacts:
paths: paths:
......
Makefile
View file @ 34792d70
...@@ -21,7 +21,7 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS)) ...@@ -21,7 +21,7 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS))
CPPFLAGS_ := $(INC_FLAGS) -MMD -MP CPPFLAGS_ := $(INC_FLAGS) -MMD -MP
CFLAGS_ = -O2 --shared -g3 -fPIC -Wall -Wextra -Wno-unused-parameter CFLAGS_ = -O2 -g3 -fPIC -Wall -Wextra -Wno-unused-parameter -Werror
ifdef MINGW ifdef MINGW
CFLAGS_ += -msse2 CFLAGS_ += -msse2
...@@ -30,9 +30,9 @@ endif ...@@ -30,9 +30,9 @@ endif
CXXFLAGS_ = -std=c++14 $(CFLAGS_) CXXFLAGS_ = -std=c++14 $(CFLAGS_)
ifdef MINGW ifdef MINGW
LDFLAGS_ = -lopengl32 -lgdi32 --shared -Wl,--subsystem,windows LDFLAGS_ = -lopengl32 -lgdi32 -shared -Wl,--subsystem,windows
else else
LDFLAGS_ = -lX11 -ldl --shared LDFLAGS_ = -lX11 -ldl -shared
endif endif
all: builder Build/$(TARGET_EXEC) all: builder Build/$(TARGET_EXEC)
......
Source/Native/OpenGL/GLTexture.h
View file @ 34792d70
...@@ -63,7 +63,6 @@ private: ...@@ -63,7 +63,6 @@ private:
int mHeight = 0; int mHeight = 0;
PixelFormat mFormat = {}; PixelFormat mFormat = {};
bool mCubeTexture = false; bool mCubeTexture = false;
bool mPBOTexture = false;
GLuint mTexture = 0; GLuint mTexture = 0;
GLuint mFramebuffer = 0; GLuint mFramebuffer = 0;
GLuint mDepthRenderbuffer = 0; GLuint mDepthRenderbuffer = 0;
......
Source/Native/OpenGL/OpenGLContext.cpp
View file @ 34792d70
...@@ -513,9 +513,6 @@ private: ...@@ -513,9 +513,6 @@ private:
bool is_glx_extension_supported(const char* ext_name); bool is_glx_extension_supported(const char* ext_name);
int major_version = 3;
int minor_version = 2;
void* opengl_lib_handle = nullptr; void* opengl_lib_handle = nullptr;
}; };
......