Add MinGW support for CMake (#14)

Author: walbourn

CMakeLists.txt

@@ -13,7 +13,7 @@ project (DXUT
 
 option(ENABLE_CODE_ANALYSIS "Use Static Code Analysis on build" OFF)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -62,29 +62,39 @@ add_library(${PROJECT_NAME} STATIC ${CORE_LIBRARY_SOURCES} ${CORE_LIBRARY_HEADER
 set(OPT_LIBRARY_HEADERS
     Optional/DXUTcamera.h
     Optional/DXUTgui.h
-    Optional/DXUTguiIME.h
     Optional/DXUTLockFreePipe.h
     Optional/DXUTres.h
     Optional/DXUTsettingsdlg.h
-    Optional/ImeUi.h
     Optional/SDKmesh.h
     Optional/SDKmisc.h
 )
 
 set(OPT_LIBRARY_SOURCES
     Optional/DXUTcamera.cpp
     Optional/DXUTgui.cpp
-    Optional/DXUTguiIME.cpp
     Optional/DXUTres.cpp
     Optional/DXUTsettingsdlg.cpp
-    Optional/ImeUi.cpp
     Optional/SDKmesh.cpp
     Optional/SDKmisc.cpp
 )
 
+if(NOT MINGW)
+    set(OPT_LIBRARY_HEADERS
+        ${OPT_LIBRARY_HEADERS}
+        Optional/DXUTguiIME.h
+        Optional/ImeUi.h
+    )
+
+    set(OPT_LIBRARY_SOURCES
+        ${OPT_LIBRARY_SOURCES}
+        Optional/DXUTguiIME.cpp
+        Optional/ImeUi.cpp
+    )
+endif()
+
 add_library(${PROJECT_NAME}Opt STATIC ${OPT_LIBRARY_SOURCES} ${OPT_CORE_LIBRARY_HEADERS})
 
-if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16")
+if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16" AND (NOT MINGW))
     target_precompile_headers(${PROJECT_NAME} PRIVATE Core/DXUT.h)
     target_precompile_headers(${PROJECT_NAME}Opt PRIVATE Core/DXUT.h)
 endif()
@@ -155,13 +165,26 @@ install(FILES
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/cmake/)
 
 if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE /fp:fast)
-    target_compile_options(${PROJECT_NAME}Opt PRIVATE /fp:fast)
+    target_compile_options(${PROJECT_NAME} PRIVATE /fp:fast "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
+    target_compile_options(${PROJECT_NAME}Opt PRIVATE /fp:fast "$<$<NOT:$<CONFIG:DEBUG>>:/guard:cf>")
+endif()
 
-    if((${CMAKE_SIZEOF_VOID_P} EQUAL 4) AND (NOT ${DIRECTX_ARCH} MATCHES "^arm"))
-        target_compile_options(${PROJECT_NAME} PRIVATE /arch:SSE2)
-        target_compile_options(${PROJECT_NAME}Opt PRIVATE /arch:SSE2)
+if (MINGW OR VCPKG_TOOLCHAIN)
+    message("INFO: Using VCPKG for DirectXMath.")
+    find_package(directxmath CONFIG REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath)
+    target_link_libraries(${PROJECT_NAME}Opt PRIVATE Microsoft::DirectXMath)
+endif()
+
+if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
+    if (${CMAKE_SIZEOF_VOID_P} EQUAL "4")
+        set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
+    else()
+        set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
     endif()
+
+    target_compile_options(${PROJECT_NAME} PRIVATE ${ARCH_SSE2})
+    target_compile_options(${PROJECT_NAME}Opt PRIVATE ${ARCH_SSE2})
 endif()
 
 if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -170,8 +193,8 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     target_compile_options(${PROJECT_NAME}Opt PRIVATE ${WarningsLib})
 endif()
 if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
-    target_compile_options(${PROJECT_NAME} PRIVATE /permissive- /JMC- /Zc:__cplusplus)
-    target_compile_options(${PROJECT_NAME}Opt PRIVATE /permissive- /JMC- /Zc:__cplusplus)
+    target_compile_options(${PROJECT_NAME} PRIVATE /sdl /permissive- /JMC- /Zc:__cplusplus)
+    target_compile_options(${PROJECT_NAME}Opt PRIVATE /sdl /permissive- /JMC- /Zc:__cplusplus)
 
     if(ENABLE_CODE_ANALYSIS)
       target_compile_options(${PROJECT_NAME} PRIVATE /analyze)

CMakePresets.json

@@ -72,6 +72,28 @@
         "strategy": "external"
       }
     },
+    {
+      "name": "GNUC",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": "g++.exe"
+      },
+      "toolset": {
+        "value": "host=x64",
+        "strategy": "external"
+      }
+    },
+
+    {
+      "name": "VCPKG",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": {
+          "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+          "type": "FILEPATH"
+        }
+      },
+      "hidden": true
+    },
 
     { "name": "x64-Debug"        , "description": "MSVC for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "MSVC" ] },
     { "name": "x64-Release"      , "description": "MSVC for x64 (Release)", "inherits": [ "base", "x64", "Release", "MSVC" ] },
@@ -83,6 +105,11 @@
     { "name": "x64-Debug-Clang"    , "description": "Clang/LLVM for x64 (Debug)", "inherits": [ "base", "x64", "Debug", "Clang" ] },
     { "name": "x64-Release-Clang"  , "description": "Clang/LLVM for x64 (Release)", "inherits": [ "base", "x64", "Release", "Clang" ] },
     { "name": "x86-Debug-Clang"    , "description": "Clang/LLVM for x86 (Debug)", "inherits": [ "base", "x86", "Debug", "Clang" ], "environment": { "CXXFLAGS": "-m32" } },
-    { "name": "x86-Release-Clang"  , "description": "Clang/LLVM for x86 (Release)", "inherits": [ "base", "x86", "Release", "Clang" ], "environment": { "CXXFLAGS": "-m32" } }
+    { "name": "x86-Release-Clang"  , "description": "Clang/LLVM for x86 (Release)", "inherits": [ "base", "x86", "Release", "Clang" ], "environment": { "CXXFLAGS": "-m32" } },
+
+    { "name": "x64-Debug-MinGW"  , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG" ], "environment": { "PATH": "$penv{PATH};c:/mingw64/bin" } },
+    { "name": "x64-Release-MinGW", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG" ], "environment": { "PATH": "$penv{PATH};c:/mingw64/bin" } },
+    { "name": "x86-Debug-MinGW"  , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG" ], "environment": { "PATH": "$penv{PATH};c:/mingw32/bin" } },
+    { "name": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG" ], "environment": { "PATH": "$penv{PATH};c:/mingw32/bin" } }
   ]
 }

Core/DDSTextureLoader.cpp

@@ -125,16 +125,18 @@ namespace
 
     inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
 
+    #if defined(_DEBUG) || defined(PROFILE)
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char (&name)[TNameLength]) noexcept
     {
-    #if defined(_DEBUG) || defined(PROFILE)
         resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
+    }
     #else
-        UNREFERENCED_PARAMETER(resource);
-        UNREFERENCED_PARAMETER(name);
-    #endif
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_ const char(&)[TNameLength]) noexcept
+    {
     }
+    #endif
 
     //--------------------------------------------------------------------------------------
     HRESULT LoadTextureDataFromMemory(

Core/DXUT.cpp

@@ -3120,7 +3120,7 @@ void DXUTCleanup3DEnvironment( _In_ bool bReleaseSettings )
             ID3D11Debug * d3dDebug = nullptr;
             if( SUCCEEDED( pd3dDevice->QueryInterface( IID_PPV_ARGS(&d3dDebug) ) ) )
             {
-                d3dDebug->ReportLiveDeviceObjects( D3D11_RLDO_SUMMARY | D3D11_RLDO_DETAIL );
+                d3dDebug->ReportLiveDeviceObjects( static_cast<D3D11_RLDO_FLAGS>(D3D11_RLDO_SUMMARY | D3D11_RLDO_DETAIL) );
                 d3dDebug->Release();
             }
 #endif

Core/DXUTmisc.cpp

@@ -11,6 +11,10 @@
 #include "DXUT.h"
 #include <xinput.h>
 
+#ifndef XINPUT_DLL_W
+#define XINPUT_DLL_W L"xinput9_1_0.dll"
+#endif
+
 #include "ScreenGrab.h"
 
 
@@ -938,7 +942,7 @@ HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbst
     static LPXINPUTGETCAPABILITIES s_pXInputGetCapabilities = nullptr;
     if( !s_pXInputGetState || !s_pXInputGetCapabilities )
     {
-        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+        HINSTANCE hInst = LoadLibraryExW( XINPUT_DLL_W, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
         {
             s_pXInputGetState = reinterpret_cast<LPXINPUTGETSTATE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputGetState" ) ) );
@@ -1045,7 +1049,7 @@ void DXUTEnableXInput( _In_ bool bEnable )
     static LPXINPUTENABLE s_pXInputEnable = nullptr;
     if( !s_pXInputEnable )
     {
-        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+        HINSTANCE hInst = LoadLibraryExW( XINPUT_DLL_W, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
             s_pXInputEnable = reinterpret_cast<LPXINPUTENABLE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputEnable" ) ) );
     }
@@ -1064,7 +1068,7 @@ HRESULT DXUTStopRumbleOnAllControllers()
     static LPXINPUTSETSTATE s_pXInputSetState = nullptr;
     if( !s_pXInputSetState )
     {
-        HINSTANCE hInst = LoadLibraryEx( XINPUT_DLL, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
+        HINSTANCE hInst = LoadLibraryExW( XINPUT_DLL_W, nullptr, 0x00000800 /* LOAD_LIBRARY_SEARCH_SYSTEM32 */ );
         if( hInst )
             s_pXInputSetState = reinterpret_cast<LPXINPUTSETSTATE>( reinterpret_cast<void*>( GetProcAddress( hInst, "XInputSetState" ) ) );
     }

Core/DXUTmisc.h

@@ -138,7 +138,7 @@ const WCHAR* WINAPI DXUTTraceWindowsMessage( _In_ UINT uMsg );
 #else
 #define DXUT_ERR(str,hr)           (hr)
 #define DXUT_ERR_MSGBOX(str,hr)    (hr)
-#define DXUTTRACE                  (__noop)
+#define DXUTTRACE
 #endif
 
 
@@ -224,9 +224,9 @@ const DWORD DXUT_PERFEVENTCOLOR3 = 0xFF6464C8;
 #define DXUT_SetPerfMarker( color, pstrMessage )    DXUT_Dynamic_D3DPERF_SetMarker( color, pstrMessage )
 #else
 // PROFILE is not defined, so these macros do nothing
-#define DXUT_BeginPerfEvent( color, pstrMessage )   (__noop)
-#define DXUT_EndPerfEvent()                         (__noop)
-#define DXUT_SetPerfMarker( color, pstrMessage )    (__noop)
+#define DXUT_BeginPerfEvent( color, pstrMessage )
+#define DXUT_EndPerfEvent()
+#define DXUT_SetPerfMarker( color, pstrMessage )
 #endif
 
 //--------------------------------------------------------------------------------------

Core/WICTextureLoader.cpp

@@ -36,6 +36,8 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cfloat>
+#include <cmath>
 #include <cstring>
 #include <iterator>
 #include <memory>
@@ -53,16 +55,18 @@ using Microsoft::WRL::ComPtr;
 namespace
 {
     //--------------------------------------------------------------------------------------
+#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
     template<UINT TNameLength>
     inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char(&name)[TNameLength]) noexcept
     {
-#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
         resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
+    }
 #else
-        UNREFERENCED_PARAMETER(resource);
-        UNREFERENCED_PARAMETER(name);
-#endif
+    template<UINT TNameLength>
+    inline void SetDebugObjectName(_In_ ID3D11DeviceChild*, _In_ const char(&)[TNameLength]) noexcept
+    {
     }
+#endif
 
     //-------------------------------------------------------------------------------------
     // WIC Pixel Format Translation Data

Optional/DXUTcamera.cpp

@@ -298,11 +298,8 @@ void CBaseCamera::SetProjParams( float fFOV, float fAspect, float fNearPlane, fl
 // Call this from your message proc so this class can handle window messages
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-LRESULT CBaseCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+LRESULT CBaseCamera::HandleMessages( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER( hWnd );
-    UNREFERENCED_PARAMETER( lParam );
-
     switch( uMsg )
     {
         case WM_KEYDOWN:
@@ -1109,10 +1106,8 @@ CDXUTDirectionWidget::CDXUTDirectionWidget() noexcept :
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
 LRESULT CDXUTDirectionWidget::HandleMessages( HWND hWnd, UINT uMsg,
-                                              WPARAM wParam, LPARAM lParam )
+                                              WPARAM, LPARAM lParam )
 {
-    UNREFERENCED_PARAMETER(wParam);
-
     switch( uMsg )
     {
         case WM_LBUTTONDOWN:
@@ -1220,23 +1215,17 @@ HRESULT CDXUTDirectionWidget::UpdateLightDir()
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT CDXUTDirectionWidget::OnRender( FXMVECTOR color, CXMMATRIX mView, CXMMATRIX mProj, FXMVECTOR vEyePt )
+HRESULT CDXUTDirectionWidget::OnRender( FXMVECTOR, CXMMATRIX, CXMMATRIX, FXMVECTOR)
 {
-    UNREFERENCED_PARAMETER(color);
-    UNREFERENCED_PARAMETER(mView);
-    UNREFERENCED_PARAMETER(mProj);
-    UNREFERENCED_PARAMETER(vEyePt);
     // TODO - 
     return S_OK;
 }
 
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT CDXUTDirectionWidget::StaticOnD3D11CreateDevice( ID3D11Device* pd3dDevice, ID3D11DeviceContext* pd3dImmediateContext )
+HRESULT CDXUTDirectionWidget::StaticOnD3D11CreateDevice( ID3D11Device*, ID3D11DeviceContext*)
 {
-    UNREFERENCED_PARAMETER(pd3dDevice);
-    UNREFERENCED_PARAMETER(pd3dImmediateContext);
     // TODO -
     return S_OK;
 }

Optional/DXUTgui.cpp

@@ -1108,9 +1108,8 @@ void CDXUTDialog::SetControlEnabled( _In_ int ID, _In_ bool bEnabled )
 
 
 //--------------------------------------------------------------------------------------
-void CDXUTDialog::OnMouseUp( _In_ const POINT& pt )
+void CDXUTDialog::OnMouseUp( _In_ const POINT& )
 {
-    UNREFERENCED_PARAMETER(pt);
     s_pControlPressed = nullptr;
     m_pControlMouseOver = nullptr;
 }
@@ -1596,10 +1595,8 @@ void CDXUTDialog::RequestFocus( _In_ CDXUTControl* pControl )
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT CDXUTDialog::DrawRect( const RECT* pRect, DWORD color )
+HRESULT CDXUTDialog::DrawRect( const RECT*, DWORD )
 {
-    UNREFERENCED_PARAMETER(pRect);
-    UNREFERENCED_PARAMETER(color);
     // TODO -
     return E_FAIL;
 }
@@ -1691,15 +1688,12 @@ HRESULT CDXUTDialog::DrawSprite( CDXUTElement* pElement, const RECT* prcDest, fl
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-HRESULT CDXUTDialog::CalcTextRect( LPCWSTR strText, CDXUTElement* pElement, const RECT* prcDest, int nCount )
+HRESULT CDXUTDialog::CalcTextRect( LPCWSTR, CDXUTElement* pElement, const RECT*, int)
 {
     auto pFontNode = GetFont( pElement->iFont );
     if( !pFontNode )
         return E_FAIL;
 
-    UNREFERENCED_PARAMETER(strText);
-    UNREFERENCED_PARAMETER(prcDest);
-    UNREFERENCED_PARAMETER(nCount);
     // TODO -
 
     return S_OK;
@@ -2284,12 +2278,8 @@ CDXUTDialogResourceManager::~CDXUTDialogResourceManager()
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-bool CDXUTDialogResourceManager::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+bool CDXUTDialogResourceManager::MsgProc( HWND, UINT, WPARAM, LPARAM )
 {
-    UNREFERENCED_PARAMETER(hWnd);
-    UNREFERENCED_PARAMETER(uMsg);
-    UNREFERENCED_PARAMETER(wParam);
-    UNREFERENCED_PARAMETER(lParam);
     return false;
 }
 
@@ -3053,11 +3043,8 @@ bool CDXUTButton::HandleKeyboard( UINT uMsg, WPARAM wParam, LPARAM lParam )
 
 //--------------------------------------------------------------------------------------
 _Use_decl_annotations_
-bool CDXUTButton::HandleMouse( UINT uMsg, const POINT& pt, WPARAM wParam, LPARAM lParam )
+bool CDXUTButton::HandleMouse( UINT uMsg, const POINT& pt, WPARAM, LPARAM)
 {
-    UNREFERENCED_PARAMETER(wParam);
-    UNREFERENCED_PARAMETER(lParam);
-
     if( !m_bEnabled || !m_bVisible )
         return false;