fix 32-bit Windows XP build
This commit is contained in:
parent
03845e4abf
commit
1c12c75552
12
Makefile
12
Makefile
@ -12,20 +12,24 @@ CXXSTD += -std=gnu++14
|
|||||||
|
|
||||||
CFLAGS += -Wall -Werror -Wfatal-errors
|
CFLAGS += -Wall -Werror -Wfatal-errors
|
||||||
CFLAGS += -Wno-error=unused-function
|
CFLAGS += -Wno-error=unused-function
|
||||||
CFLAGS += -Wno-error=unused-const-variable
|
#CFLAGS += -Wno-error=unused-const-variable
|
||||||
#CFLAGS += -Wno-error=unused-but-set-variable
|
#CFLAGS += -Wno-error=unused-but-set-variable
|
||||||
CFLAGS += -Wno-error=unused-variable
|
CFLAGS += -Wno-error=unused-variable
|
||||||
|
CFLAGS += -Wno-error=narrowing
|
||||||
CFLAGS += -I$(MAKEFILE_PATH)/include
|
CFLAGS += -I$(MAKEFILE_PATH)/include
|
||||||
CFLAGS += -I$(dir $(GLFW))../include
|
CFLAGS += -I$(dir $(GLFW))../include
|
||||||
CXXFLAGS += -fno-exceptions
|
CXXFLAGS += -fno-exceptions
|
||||||
#CFLAGS += -DDEBUG_BUTTONS
|
#CFLAGS += -DDEBUG_BUTTONS
|
||||||
#CFLAGS += -DDEBUG_AXES
|
#CFLAGS += -DDEBUG_AXES
|
||||||
LDFLAGS += -nostdlib++ -lm
|
LDFLAGS += -lm
|
||||||
ifeq ($(shell uname),Linux)
|
ifneq ($(shell uname),Darwin)
|
||||||
LDFLAGS += -static-libgcc
|
LDFLAGS += -static-libgcc
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(shell uname),Linux)
|
||||||
|
LDFLAGS += -nostdlib++
|
||||||
|
endif
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
LDFLAGS += -Wl,--subsystem,windows -mwindows
|
LDFLAGS += -Wl,--subsystem,windows -mwindows #-mconsole
|
||||||
endif
|
endif
|
||||||
ifeq ($(shell uname),Darwin)
|
ifeq ($(shell uname),Darwin)
|
||||||
LDFLAGS += -framework Foundation -framework IOKit -framework AppKit
|
LDFLAGS += -framework Foundation -framework IOKit -framework AppKit
|
||||||
|
|||||||
@ -149,7 +149,8 @@ template <typename T>
|
|||||||
inline constexpr T inverse_length(vec<3, T> v)
|
inline constexpr T inverse_length(vec<3, T> v)
|
||||||
{
|
{
|
||||||
float f = dot(v, v);
|
float f = dot(v, v);
|
||||||
return 1.0f / sqrt<T>(f);
|
float sqrtf = sqrt(f);
|
||||||
|
return 1.0f / sqrtf;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
|||||||
@ -213,7 +213,7 @@ int main()
|
|||||||
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
glActiveTexture(GL_TEXTURE0);
|
||||||
uint terminus_font = make_texture(src_font_ter_u32n_data_start,
|
uint terminus_font = make_texture(src_font_ter_u32n_data_start,
|
||||||
GL_RED,
|
GL_RGB,
|
||||||
256,
|
256,
|
||||||
256,
|
256,
|
||||||
GL_RED);
|
GL_RED);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user