Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE] experiments pr #834

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,18 @@ if(WIN32)
if(OPTIMIZE_MODE STREQUAL "On")
message(STATUS "Optimizing with PGO data")
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -Wno-profile-instr-missing -Wno-profile-instr-out-of-date -fprofile-instr-use=code.profdata)
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type /DNDEBUG /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -Wno-profile-instr-missing -Wno-profile-instr-out-of-date -fprofile-instr-use=code.profdata)
target_link_options(AliceCommon INTERFACE /OPT:REF /OPT:ICF /LTCG -fprofile-instr-use=code.profdata)
elseif(PROFILE_MODE STREQUAL "On")
message(STATUS "Compiling for PGO instrumentation")
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -fprofile-instr-generate)
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type /DNDEBUG /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline -fprofile-instr-generate)
target_link_options(AliceCommon INTERFACE /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG -fprofile-instr-generate)
else()
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /WX /GF /w34388 /w34389 -Wno-unused-macros -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field /Z7 -Wno-invalid-offsetof -Wno-deprecated-volatile -Wno-missing-prototypes -Wno-reserved-identifier -Wno-implicit-int-float-conversion -Wno-unsafe-buffer-usage -Wno-float-equal -Wno-shadow-field-in-constructor -Wno-gnu-anonymous-struct -Wno-nested-anon-types -Wno-double-promotion -Wno-shadow-uncaptured-local -Wno-nonportable-system-include-path -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-ctad-maybe-unsupported -Wno-implicit-int-conversion -Wno-disabled-macro-expansion -Wno-comma -Wno-cast-function-type-strict -Wno-cast-function-type
$<$<CONFIG:Debug>: /RTC1 /EHsc /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
target_link_options(AliceCommon INTERFACE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
Expand All @@ -103,20 +103,20 @@ if(WIN32)
if(OPTIMIZE_MODE STREQUAL "On")
message(STATUS "Optimizing with PGO data")
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /Zc:preprocessor /WX /arch:AVX2 /GF /w34388 /w34389 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline)
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /WX /GF /w34388 /w34389 /DNDEBUG /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /Zc:inline)
target_link_options(AliceCommon INTERFACE /OPT:REF /OPT:ICF /LTCG /USEPROFILE)
elseif(PROFILE_MODE STREQUAL "On")
message(STATUS "Compiling for PGO instrumentation")
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /Zc:preprocessor /WX /arch:AVX2 /GF /w34388 /w34389 /Z7 /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline)
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /wd4723 /GR- /W4 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /WX /GF /w34388 /w34389 /Z7 /DNDEBUG /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /Zc:inline)
target_link_options(AliceCommon INTERFACE /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG /GENPROFILE)
else()
message(STATUS "Normal, not PGO, build")
target_compile_options(AliceCommon INTERFACE
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /Zc:preprocessor /WX /arch:AVX2 /GF /w34388 /w34389 /Z7
$<$<CONFIG:Debug>: /EHsc /MTd /RTC1 /Od>
/bigobj /wd4100 /wd4189 /wd4065 /wd4201 /wd4324 /GR- /W4 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /WX /GF /w34388 /w34389 /Z7
$<$<CONFIG:Debug>: /EHsc /RTC1 /Od>
# for faster debug builds, replace /RTC1 /Od with /O1 -- should be able to use /Ox, but for some reason that crashes ZSTD
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:preprocessor /Zc:inline>)
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /Zc:inline>)
target_link_options(AliceCommon INTERFACE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /DEBUG:FULL /OPT:REF /OPT:ICF /LTCG>)
Expand Down
14 changes: 7 additions & 7 deletions ParserGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ add_executable(ParserGenerator ${PROJECT_SRC})


if(WIN32)
# removed /Zc:preprocessor for clang
# removed /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor for clang
set(CMAKE_CXX_FLAGS "")
set(CMAKE_CXX_FLAGS_DEBUG "")
set(CMAKE_CXX_FLAGS_RELEASE "")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

target_compile_options(ParserGenerator PRIVATE
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /w34388 /w34389
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /WX /GF /w34388 /w34389
-Wno-missing-prototypes -Wno-unsafe-buffer-usage
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od /RTC1>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
$<$<CONFIG:Debug>: /RTC1 /EHsc /Od /RTC1>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
target_link_options(ParserGenerator PRIVATE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
else()
target_compile_options(ParserGenerator PRIVATE
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /Zc:preprocessor /WX /arch:AVX2 /GF /w34388 /w34389
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od /RTC1>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /Zc:preprocessor /GS- /Gy /Gw /Zc:inline>)
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /WX /GF /w34388 /w34389
$<$<CONFIG:Debug>: /RTC1 /EHsc /Od /RTC1>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /GL /sdl- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GS- /Gy /Gw /Zc:inline>)
target_link_options(ParserGenerator PRIVATE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
Expand Down
15 changes: 15 additions & 0 deletions assets/shaders/model3d_f.glsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
in vec2 tex_coord;
layout (location = 0) out vec4 frag_color;
layout (binding = 14) uniform sampler2D diffuse_texture;

layout (location = 11) uniform float gamma;

vec4 gamma_correct(vec4 colour) {
return vec4(pow(colour.rgb, vec3(1.f / gamma)), colour.a);
}

void main() {
vec4 out_color = texture(diffuse_texture, tex_coord);
//out_color.a = 0.f;
frag_color = gamma_correct(out_color);
}
61 changes: 61 additions & 0 deletions assets/shaders/model3d_v.glsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Goes from 0 to 1
layout (location = 0) in vec3 vertex_position;
layout (location = 1) in vec2 normal_direction;
layout (location = 2) in vec2 texture_coord;

out vec2 tex_coord;

layout (location = 0) uniform vec2 offset;
layout (location = 1) uniform float aspect_ratio;
layout (location = 2) uniform float zoom;
layout (location = 3) uniform vec2 map_size;
layout (location = 5) uniform mat3 rotation;

subroutine vec4 calc_gl_position_class(vec3 world_pos);
subroutine uniform calc_gl_position_class calc_gl_position;

layout(index = 0) subroutine(calc_gl_position_class)
vec4 globe_coords(vec3 world_pos) {
vec3 new_world_pos;
float section_x = 200;
float angle_x1 = 2 * PI * floor(world_pos.x * section_x) / section_x;
float angle_x2 = 2 * PI * floor(world_pos.x * section_x + 1) / section_x;
float angle_x = mix(angle_x1, angle_x2, mod(world_pos.x * section_x, 1));
new_world_pos.x = mix(cos(angle_x1), cos(angle_x2), mod(world_pos.x * section_x, 1));
new_world_pos.y = mix(sin(angle_x1), sin(angle_x2), mod(world_pos.x * section_x, 1));
float section_y = 200;
float angle_y1 = PI * floor(world_pos.y * section_y) / section_y;
float angle_y2 = PI * floor(world_pos.y * section_y + 1) / section_y;
new_world_pos.x *= mix(sin(angle_y1), sin(angle_y2), mod(world_pos.y * section_y, 1));
new_world_pos.y *= mix(sin(angle_y1), sin(angle_y2), mod(world_pos.y * section_y, 1));
new_world_pos.z = mix(cos(angle_y1), cos(angle_y2), mod(world_pos.y * section_y, 1));
new_world_pos = rotation * new_world_pos;
new_world_pos /= PI; // Will make the zoom be the same for the globe and flat map
new_world_pos.y *= 0.02; // Sqeeze the z coords. Needs to be between -1 and 1
new_world_pos.xz *= -1; // Invert the globe
new_world_pos.xyz += 0.5; // Move the globe to the center

return vec4(
(2. * new_world_pos.x - 1.f) / aspect_ratio * zoom,
(2. * new_world_pos.z - 1.f) * zoom,
(2. * new_world_pos.y - 1.f), 1.0);
}

layout(index = 1) subroutine(calc_gl_position_class)
vec4 flat_coords(vec3 world_pos) {
float vertical_factor = ((map_size.x + map_size.y) / 2.f);
world_pos /= vec3(map_size.x, map_size.y, vertical_factor);
world_pos -= vec3(offset.x, 0.f, offset.y);
world_pos.x = mod(world_pos.x, 1.0f);
return vec4(
(2.f * +world_pos.x - 1.f) * zoom,
(2.f * -world_pos.z - 1.f) * zoom,
(2.f * +world_pos.y),
1.0f
);
}

void main() {
gl_Position = calc_gl_position(vertex_position);
tex_coord = texture_coord;
}
12 changes: 6 additions & 6 deletions dependencies/DataContainerGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ if(WIN32)
set(CMAKE_CXX_FLAGS_RELEASE "")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(DCONGENERATOR PRIVATE
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /WX /arch:AVX2 /GF /wd4388 /wd4389 -Wno-unused-parameter -Wno-sign-compare -Wno-newline-eof -Wno-missing-prototypes -Wno-unsafe-buffer-usage -Wno-shadow-uncaptured-local -Wno-unreachable-code-break
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /WX /GF /wd4388 /wd4389 -Wno-unused-parameter -Wno-sign-compare -Wno-newline-eof -Wno-missing-prototypes -Wno-unsafe-buffer-usage -Wno-shadow-uncaptured-local -Wno-unreachable-code-break
$<$<CONFIG:Debug>: /RTC1 /EHsc /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline>)
target_link_options(DCONGENERATOR PRIVATE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
else()
target_compile_options(DCONGENERATOR PRIVATE
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /Zc:preprocessor /WX /arch:AVX2 /GF /wd4388 /wd4389
$<$<CONFIG:Debug>: /RTC1 /EHsc /MTd /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /MT /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline>)
/bigobj /wd4100 /wd4189 /wd4065 /GR- /W4 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /WX /GF /wd4388 /wd4389
$<$<CONFIG:Debug>: /RTC1 /EHsc /Od>
$<$<NOT:$<CONFIG:Debug>>: /DNDEBUG /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline>)
target_link_options(DCONGENERATOR PRIVATE
$<$<CONFIG:Debug>: /DEBUG:FULL >
$<$<NOT:$<CONFIG:Debug>>: /OPT:REF /OPT:ICF /LTCG>)
Expand Down
8 changes: 4 additions & 4 deletions dependencies/freetype/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ if(WIN32)

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
else()
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
endif()
else()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
else()
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(freetype PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
endif()
endif()
endif()
8 changes: 4 additions & 4 deletions dependencies/glew/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ if(WIN32)

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
else()
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
endif()
else()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
else()
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(libglew_static PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
endif()
endif()
endif()
Expand Down
8 changes: 4 additions & 4 deletions dependencies/tbb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ if(WIN32)

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
else()
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/MTd /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /RTC1 /EHsc /Od /RTC1")
endif()
else()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /GF /w34388 /w34389 /wd4530 /O2 /Oi /sdl- /GS- /Gy /Gw /Zc:inline")
else()
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/MT /wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
set_target_properties(tbb PROPERTIES COMPILE_FLAGS "/wd4100 /wd4189 /wd4065 /GR- /W3 /permissive- /D_USE_STD_VECTOR_ALGORITHMS=0 /Zc:preprocessor /GF /w34388 /w34389 /wd4530 /O2 /Oi /GL /sdl- /GS- /Gy /Gw /Zc:inline")
endif()
endif()
else() # GCC or CLANG
Expand Down
3 changes: 3 additions & 0 deletions src/launcher/launcher_main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#undef _USE_STD_VECTOR_ALGORITHMS
#define _USE_STD_VECTOR_ALGORITHMS 0

#ifndef UNICODE
#define UNICODE
#endif
Expand Down
6 changes: 6 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#ifdef __AVX2__
#error "We cannot do avx2!"
#endif
#undef _USE_STD_VECTOR_ALGORITHMS
#define _USE_STD_VECTOR_ALGORITHMS 0

#ifdef LOCAL_USER_SETTINGS
#include "local_user_settings.hpp"
#endif
Expand Down
Loading
Loading