d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 19:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

WinMain is cmake specific

Browse source
This commit is contained in:
Nicolas Werner 2021-12-16 06:49:12 +01:00
parent c856840284
commit 6b49fe257f
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -12,7 +12,7 @@ compiler = meson.get_compiler('cpp')
qt5 = import('qt5') qt5 = import('qt5')
qt5_modules = ['Core', 'Qml', 'Quick', 'QuickWidgets', 'Widgets', 'Multimedia', 'Svg'] qt5_modules = ['Core', 'Qml', 'Quick', 'QuickWidgets', 'Widgets', 'Multimedia', 'Svg']
if target_machine.system() == 'windows' if target_machine.system() == 'windows'
qt5_modules += 'WinMain' #qt5_modules += 'WinMain'
elif target_machine.system() == 'darwin' elif target_machine.system() == 'darwin'
qt5_modules += 'MacExtras' qt5_modules += 'MacExtras'
else else
@ -320,8 +320,8 @@ if host_machine.system() == 'darwin'
deps += dependency('UserNotifications', method: 'extraframework') deps += dependency('UserNotifications', method: 'extraframework')
elif host_machine.system() == 'windows' elif host_machine.system() == 'windows'
sources += ['src/notifications/ManagerWin.cpp'] sources += ['src/notifications/ManagerWin.cpp']
add_project_arguments('-D_WIN32_WINNT=0x0601', '-DNOMINMAX WIN32_LEAN_AND_MEAN', '-DSTRICT', '/Zc:__cplusplus', language: 'cpp') add_project_arguments('-DNOMINMAX WIN32_LEAN_AND_MEAN', '-DSTRICT', '/Zc:__cplusplus', language: 'cpp')
deps += dependency('wintoastlib') deps += dependency('wintoast')
else else
sources += ['src/notifications/ManagerLinux.cpp'] sources += ['src/notifications/ManagerLinux.cpp']
endif endif
@ -334,6 +334,7 @@ executable('nheko',
cpp_args: '-DQAPPLICATION_CLASS=QApplication', cpp_args: '-DQAPPLICATION_CLASS=QApplication',
include_directories: inc, include_directories: inc,
dependencies : deps, dependencies : deps,
win_subsystem: 'windows,6.1',
install: true) install: true)
if target_machine.system() != 'windows' and target_machine.system() != 'darwin' if target_machine.system() != 'windows' and target_machine.system() != 'darwin'

2
subprojects/packagefiles/wintoast/meson.build
View file

@ -14,7 +14,7 @@ install_headers(
inc = include_directories('src') inc = include_directories('src')
wintoastlib = library( wintoastlib = library(
'wintoast', 'wintoast',
'wintoastlib.cpp', 'src/wintoastlib.cpp',
include_directories: inc, include_directories: inc,
) )