Skip to content

Commit c330a6f

Browse files
committed
address some PR comments
1 parent 8e24841 commit c330a6f

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

cmake/XRay.Configurations.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ if (is_multi_config)
1818
message(WARNING "CMAKE_BUILD_TYPE is ignored with multi-config generator.")
1919
unset(CMAKE_BUILD_TYPE)
2020
endif()
21-
22-
if (WIN32)
23-
unset(CMAKE_DEFAULT_BUILD_TYPE)
24-
endif()
2521
else()
2622
message(DEBUG "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
2723
if (NOT CMAKE_BUILD_TYPE)

res/fsgame.ltx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $game_data$ = false| true| $fs_root$| gamedata\
1010
$game_ai$ = true| false| $game_data$| ai\
1111
$game_spawn$ = true| false| $game_data$| spawns\
1212
$game_levels$ = true| false| $game_data$| levels\
13-
$game_meshes$ = true| true| $game_data$| meshes\| *.ogf;*.omf;*.ozzx| Game Object files
13+
$game_meshes$ = true| true| $game_data$| meshes\| *.ogf;*.omf| Game Object files
1414
$game_anims$ = true| true| $game_data$| anims\| *.anm;*.anms| Animation files
1515
$game_dm$ = true| true| $game_data$| meshes\| *.dm| Detail Model files
1616
$game_shaders$ = true| true| $game_data$| shaders\

src/xrEngine/x_ray.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@
2828

2929
#ifdef XR_PLATFORM_WINDOWS
3030
#include <locale>
31-
32-
#ifdef XR_PLATFORM_WINDOWS
3331
#include "DiscordGameSDK/discord.h"
3432
#define USE_DISCORD_INTEGRATION
35-
#endif
36-
3733
#include "xrCore/Text/StringConversion.hpp"
3834
#endif
3935

0 commit comments

Comments
 (0)