Skip to content

Commit 7adb075

Browse files
committed
fix clang build on windows
1 parent 7e0d2f8 commit 7adb075

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

WickedEngine/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ add_library(${TARGET_NAME} ${WICKED_LIBRARY_TYPE}
6969
${HEADER_FILES}
7070
)
7171

72-
if(MSVC)
73-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /bigobj")
74-
endif()
7572

7673
add_library(WickedEngine ALIAS ${TARGET_NAME})
7774
set_target_properties(${TARGET_NAME} PROPERTIES
@@ -95,7 +92,13 @@ if (WIN32)
9592
UNICODE _UNICODE
9693
)
9794

98-
target_compile_options(${TARGET_NAME} PRIVATE /W3)
95+
if (MSVC)
96+
target_compile_options(${TARGET_NAME} PRIVATE
97+
/W3
98+
/MP
99+
/bigobj
100+
)
101+
endif()
99102

100103
set(LIBDXCOMPILER "dxcompiler.dll")
101104
else ()

WickedEngine/Utility/minimp4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ int MP4E_set_text_comment(MP4E_mux_t *mux, const char *comment);
494494
#define MINIMP4_IMPLEMENTATION_GUARD
495495

496496
#define FOUR_CHAR_INT(a, b, c, d) (((uint32_t)(a) << 24) | ((b) << 16) | ((c) << 8) | (d))
497-
enum
497+
enum : uint32_t
498498
{
499499
BOX_co64 = FOUR_CHAR_INT( 'c', 'o', '6', '4' ),//ChunkLargeOffsetAtomType
500500
BOX_stco = FOUR_CHAR_INT( 's', 't', 'c', 'o' ),//ChunkOffsetAtomType

0 commit comments

Comments
 (0)