Skip to content
Permalink
Browse files

Merge PR #2759: main.pro: fix-ups for "no-overlay" CONFIG option on W…

…indows
  • Loading branch information...
mkrautz committed Jan 22, 2017
2 parents e42e6ca + 920244c commit a08c509de608c07345fc06fb4805308b726bef2a
Showing with 6 additions and 5 deletions.
  1. +6 −5 main.pro
@@ -52,21 +52,22 @@ SUBDIRS *= src/mumble_proto
SUBDIRS *= plugins
}

win32 {
win32:!CONFIG(no-overlay) {
SUBDIRS *= overlay
SUBDIRS *= overlay/overlay_exe
SUBDIRS *= overlay_winx64
SUBDIRS *= overlay_winx64/overlay_exe_winx64
!CONFIG(no-g15) {
SUBDIRS *= g15helper
}
}

win32:!CONFIG(no-g15) {
SUBDIRS *= g15helper
}

contains(UNAME, OpenBSD) {
CONFIG *= no-overlay
}

!CONFIG(no-overlay) {
unix:!macx:!CONFIG(no-overlay) {
SUBDIRS *= overlay_gl
}

0 comments on commit a08c509

Please sign in to comment.
You can’t perform that action at this time.