CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/windows-console-attach' into feat/launcher-updater

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

# Conflicts:
#	launcher/Application.cpp
#	launcher/CMakeLists.txt
#	launcher/filelink/FileLink.cpp
This commit is contained in:
Rachel Powers
2023-07-30 14:26:54 -07:00
parent 7c1a465ec9 a7ef663735
commit f03924478b
5 changed files with 174 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/CMakeLists.txt
View File

@ -1100,6 +1100,14 @@ set(LAUNCHER_SOURCES
)
endif()
if(WIN32)
set(LAUNCHER_SOURCES
WindowsConsole.cpp
WindowsConsole.h
${LAUNCHER_SOURCES}
)
endif()
qt_wrap_ui(LAUNCHER_UI
ui/MainWindow.ui
ui/setupwizard/PasteWizardPage.ui