Skip to content

Commit

Permalink
s
Browse files Browse the repository at this point in the history
  • Loading branch information
PaddleStroke committed Feb 10, 2025
1 parent 2700717 commit 2ec497b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/sub_buildWindows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ jobs:
mkdir ${{ env.logdir }}
mkdir ${{ env.reportdir }}
echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
- name: Check Windows SDK installation
run: dir "C:\Program Files (x86)\Windows Kits\10\Lib"
- name: Check Environment Variables
run: |
echo "WindowsSdkDir=$env:WindowsSdkDir"
echo "WindowsSDKVersion=$env:WindowsSDKVersion"
- name: Get Ccache
uses: ./.github/workflows/actions/windows/getCcache
with:
Expand Down
9 changes: 9 additions & 0 deletions src/Gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ if(MSVC)
else()
message(FATAL_ERROR "Windows uxtheme not found in expected location: ${WINDOWS_SDK_PATH}")
endif()

Check warning on line 98 in src/Gui/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Lint / Lint

<-- trailing whitespace
check_include_file(dwmapi.h HAVE_DWMAPI_H)
check_library_exists(dwmapi DwmExtendFrameIntoClientArea "" HAVE_DWM_FUNC)
if(HAVE_DWMAPI_H)
message(STATUS "have dwmapi.h")
endif()
if(HAVE_DWM_FUNC)
message(STATUS "have DwmExtendFrameIntoClientArea")
endif()


if(FREECAD_USE_3DCONNEXION_LEGACY)
Expand Down
15 changes: 15 additions & 0 deletions src/Gui/FramelessWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,22 @@
#ifndef _PreComp_
#endif

#pragma message("Q_OS_WIN should be true")

Check warning on line 28 in src/Gui/FramelessWindow.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint

Q_OS_WIN should be true [-W#pragma-messages]

Check warning on line 28 in src/Gui/FramelessWindow.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint

Q_OS_WIN should be true [clang-diagnostic-#pragma-messages]
#ifdef Q_OS_WIN

Check warning on line 29 in src/Gui/FramelessWindow.cpp

View workflow job for this annotation

GitHub Actions / Lint / Lint

Include qglobal.h before testing Q_OS_ macros [-Wclazy-qt-macros]
#define _STRINGIZE(x) #x
#define STRINGIZE(x) _STRINGIZE(x)
#pragma message("_WIN32_WINNT: " _STRINGIZE(_WIN32_WINNT))
#pragma message("WINVER: " _STRINGIZE(WINVER))
#pragma message("NTDDI_VERSION: " _STRINGIZE(NTDDI_VERSION))

#ifdef NTDDI_VERSION
#if NTDDI_VERSION >= NTDDI_VISTA
#define HAS_DWM_API 1
#pragma message("HAS_DWM_API")
#endif
#endif


#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0601
#endif
Expand Down

0 comments on commit 2ec497b

Please sign in to comment.