Skip to content

Commit 1c5e5b6

Browse files
committed
Tweak warnings and the rest of the flags
1 parent ff7d232 commit 1c5e5b6

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${Vc_ARCHITECTURE_FLAGS}>")
3535

3636
add_compile_options($<$<COMPILE_LANGUAGE:C>:-fno-strict-aliasing>)
3737
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Werror>)
38-
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wextra>)
38+
if("${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
39+
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/W3>)
40+
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/Zc:strictStrings>)
41+
else()
42+
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wextra>)
43+
endif()
3944
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unknown-warning-option>)
4045
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>)
4146
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-value>)
@@ -46,7 +51,7 @@ add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-cast-function-type>)
4651
add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-clobbered>)
4752
add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-empty-body>)
4853
add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-parentheses>)
49-
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-Wno-pointer-sign>)
54+
add_compile_options($<$<COMPILE_LANGUAGE:C>:-Wno-pointer-sign>)
5055
add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-format-overflow>)
5156
add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-implicit-fallthrough>)
5257
add_compile_options($<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-missing-field-initializers>)
@@ -64,7 +69,6 @@ add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-implicit-in
6469
add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-int-in-bool-context>)
6570
add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-string-plus-int>)
6671
add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-missing-braces>)
67-
add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-ignored-qualifiers>)
6872
add_compile_options($<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-unknown-pragmas>)
6973
add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-delete-non-abstract-non-virtual-dtor>)
7074

dllsrc/jdllcomx.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ STDMETHODIMP CJServer::Invoke(DISPID dispID, REFIID riid
270270
{
271271
HRESULT hr;
272272
ITypeInfo *pTI;
273-
LANGID langID=PRIMARYLANGID(lcid);
274273

275274
if (IID_NULL!=riid) return DISP_E_UNKNOWNINTERFACE;
276275
hr=GetTypeInfo(0, lcid, &pTI);

jsrc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_compile_definitions(C_AVX=1 C_AVX2=1 EMU_AVX=1)
1+
add_compile_definitions(C_NA=0 C_AVX=1 C_AVX2=1 EMU_AVX=1)
22
if(WIN32)
33
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
44
endif()

0 commit comments

Comments
 (0)