Skip to content

Commit a3d032b

Browse files
JPeterMugaasJPeterMugaas
authored
Fix warnings in tools for MinGW (#428)
1 parent 187f6d6 commit a3d032b

File tree

8 files changed

+53
-6
lines changed

8 files changed

+53
-6
lines changed

‎CMakeLists.txt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,17 +370,20 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/DirectXTex.pc"
370370
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
371371

372372
#--- Command-line tools
373-
if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
374-
set(TOOL_EXES texassemble texconv texdiag)
373+
set(TOOL_EXES "")
375374

375+
if(BUILD_TOOLS AND WIN32)
376376
add_executable(texassemble
377377
Texassemble/texassemble.cpp
378378
Texassemble/texassemble.rc
379379
Texassemble/settings.manifest
380380
Texassemble/AnimatedGif.cpp)
381381
target_link_libraries(texassemble PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
382382
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
383+
list(APPEND TOOL_EXES texassemble)
384+
endif()
383385

386+
if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
384387
add_executable(texconv
385388
Texconv/texconv.cpp
386389
Texconv/texconv.rc
@@ -389,18 +392,24 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
389392
Texconv/PortablePixMap.cpp)
390393
target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
391394
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
395+
list(APPEND TOOL_EXES texconv)
392396

397+
if(BC_USE_OPENMP)
398+
target_link_libraries(texconv PRIVATE OpenMP::OpenMP_CXX)
399+
endif()
400+
endif()
401+
402+
if(BUILD_TOOLS AND WIN32)
393403
add_executable(texdiag
394404
Texdiag/texdiag.cpp
395405
Texdiag/texdiag.rc
396406
Texdiag/settings.manifest)
397407
target_link_libraries(texdiag PRIVATE ${PROJECT_NAME} ole32.lib version.lib)
398408
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
409+
list(APPEND TOOL_EXES texdiag)
410+
endif()
399411

400-
if(BC_USE_OPENMP)
401-
target_link_libraries(texconv PRIVATE OpenMP::OpenMP_CXX)
402-
endif()
403-
412+
if(BUILD_TOOLS AND WIN32)
404413
if(ENABLE_OPENEXR_SUPPORT)
405414
foreach(t IN LISTS TOOL_EXES)
406415
target_include_directories(${t} PRIVATE Auxiliary)

‎DirectXTex/DirectXTex.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,12 +1011,16 @@ namespace DirectX
10111011
#pragma clang diagnostic ignored "-Wswitch-enum"
10121012
#endif
10131013

1014+
#ifdef _MSC_VER
10141015
#pragma warning(push)
10151016
#pragma warning(disable : 4619 4616 4061)
1017+
#endif
10161018

10171019
#include "DirectXTex.inl"
10181020

1021+
#ifdef _MSC_VER
10191022
#pragma warning(pop)
1023+
#endif
10201024

10211025
#ifdef __clang__
10221026
#pragma clang diagnostic pop

‎Texassemble/AnimatedGif.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@
1313
// http://go.microsoft.com/fwlink/?LinkId=248926
1414
//--------------------------------------------------------------------------------------
1515

16+
#ifdef _MSC_VER
1617
#pragma warning(push)
1718
#pragma warning(disable : 4005)
19+
#endif
1820
#define WIN32_LEAN_AND_MEAN
1921
#define NOMINMAX
2022
#define NODRAWTEXT
2123
#define NOGDI
2224
#define NOMCX
2325
#define NOSERVICE
2426
#define NOHELP
27+
#ifdef _MSC_VER
2528
#pragma warning(pop)
29+
#endif
2630

2731
#include <cstddef>
2832
#include <iterator>
@@ -35,7 +39,9 @@
3539

3640
#include <wincodec.h>
3741

42+
#ifdef _MSC_VER
3843
#pragma warning(disable : 4619 4616 26812)
44+
#endif
3945

4046
#include "DirectXTex.h"
4147

‎Texassemble/texassemble.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@
99
// http://go.microsoft.com/fwlink/?LinkId=248926
1010
//--------------------------------------------------------------------------------------
1111

12+
#ifdef _MSC_VER
1213
#pragma warning(push)
1314
#pragma warning(disable : 4005)
15+
#endif
1416
#define WIN32_LEAN_AND_MEAN
1517
#define NOMINMAX
1618
#define NODRAWTEXT
1719
#define NOGDI
1820
#define NOMCX
1921
#define NOSERVICE
2022
#define NOHELP
23+
#ifdef _MSC_VER
2124
#pragma warning(pop)
25+
#endif
2226

2327
#if __cplusplus < 201703L
2428
#error Requires C++17 (and /Zc:__cplusplus with MSVC)
@@ -52,7 +56,9 @@
5256
#include <DirectXPackedVector.h>
5357
#include <wincodec.h>
5458

59+
#ifdef _MSC_VER
5560
#pragma warning(disable : 4619 4616 26812)
61+
#endif
5662

5763
#include "DirectXTex.h"
5864

‎Texconv/ExtendedBMP.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@
1212
// http://go.microsoft.com/fwlink/?LinkId=248926
1313
//--------------------------------------------------------------------------------------
1414

15+
#ifdef _MSC_VER
1516
#pragma warning(push)
1617
#pragma warning(disable : 4005)
18+
#endif
1719
#define WIN32_LEAN_AND_MEAN
1820
#define NOMINMAX
1921
#define NODRAWTEXT
2022
#define NOMCX
2123
#define NOSERVICE
2224
#define NOHELP
25+
#ifdef _MSC_VER
2326
#pragma warning(pop)
27+
#endif
2428

2529
#include <Windows.h>
2630

‎Texconv/PortablePixMap.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99
// http://go.microsoft.com/fwlink/?LinkId=248926
1010
//--------------------------------------------------------------------------------------
1111

12+
#ifdef _MSC_VER
1213
#pragma warning(push)
1314
#pragma warning(disable : 4005)
15+
#endif
1416
#define WIN32_LEAN_AND_MEAN
1517
#define NOMINMAX
1618
#define NODRAWTEXT
1719
#define NOMCX
1820
#define NOSERVICE
1921
#define NOHELP
22+
#ifdef _MSC_VER
2023
#pragma warning(pop)
24+
#endif
2125

2226
#include <Windows.h>
2327

‎Texconv/texconv.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99
// http://go.microsoft.com/fwlink/?LinkId=248926
1010
//--------------------------------------------------------------------------------------
1111

12+
#ifdef _MSC_VER
1213
#pragma warning(push)
1314
#pragma warning(disable : 4005)
15+
#endif
1416
#define WIN32_LEAN_AND_MEAN
1517
#define NOMINMAX
1618
#define NODRAWTEXT
1719
#define NOMCX
1820
#define NOSERVICE
1921
#define NOHELP
22+
#ifdef _MSC_VER
2023
#pragma warning(pop)
24+
#endif
2125

2226
#include <ShlObj.h>
2327

@@ -52,7 +56,9 @@
5256

5357
#include <wincodec.h>
5458

59+
#ifdef _MSC_VER
5560
#pragma warning(disable : 4619 4616 26812)
61+
#endif
5662

5763
#include "DirectXTex.h"
5864

@@ -525,7 +531,9 @@ HRESULT __cdecl SaveToPortablePixMapHDR(
525531
//////////////////////////////////////////////////////////////////////////////
526532
//////////////////////////////////////////////////////////////////////////////
527533

534+
#ifdef _MSC_VER
528535
#pragma warning( disable : 4616 6211 )
536+
#endif
529537

530538
namespace
531539
{

‎Texdiag/texdiag.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@
99
// http://go.microsoft.com/fwlink/?LinkId=248926
1010
//--------------------------------------------------------------------------------------
1111

12+
#ifdef _MSC_VER
1213
#pragma warning(push)
1314
#pragma warning(disable : 4005)
15+
#endif
1416
#define WIN32_LEAN_AND_MEAN
1517
#define NOMINMAX
1618
#define NODRAWTEXT
1719
#define NOGDI
1820
#define NOMCX
1921
#define NOSERVICE
2022
#define NOHELP
23+
#ifdef _MSC_VER
2124
#pragma warning(pop)
25+
#endif
2226

2327
#if __cplusplus < 201703L
2428
#error Requires C++17 (and /Zc:__cplusplus with MSVC)
@@ -46,7 +50,9 @@
4650

4751
#include <dxgiformat.h>
4852

53+
#ifdef _MSC_VER
4954
#pragma warning(disable : 4619 4616 26812)
55+
#endif
5056

5157
#include "DirectXTex.h"
5258

0 commit comments

Comments
 (0)