yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code
This repository has been archived on 2024-03-23. You can view files and clone it, but cannot push or open issues or pull requests.
yuzu-android/src/yuzu/CMakeLists.txt

289 lines
9.7 KiB
CMake
Raw Normal View History

CMake Cleanup
2014-08-18 04:35:44 +00:00
set(CMAKE_AUTOMOC ON)
citra-qt: Add Dark theme from https://github.com/ColinDuquesnoy/QDarkStyleSheet
2017-06-24 00:39:42 +00:00
set(CMAKE_AUTORCC ON)
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
set(CMAKE_AUTOUIC ON)
CMake Cleanup
2014-08-18 04:35:44 +00:00
set(CMAKE_INCLUDE_CURRENT_DIR ON)
Modularization of copy_msvc_libraries cmake funct Created a new folder in Citra's root called CMakeModules that should contain cmake functions used by the various CMakeLists.txt.
2016-12-11 14:36:34 +00:00
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
CMake Cleanup
2014-08-18 04:35:44 +00:00
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
add_executable(yuzu
Info.plist
about_dialog.cpp
about_dialog.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
aboutdialog.ui
Project Mjölnir: Part 2 - Controller Applet Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-08-21 11:39:24 +00:00
applets/controller.cpp
applets/controller.h
applets/controller.ui
qt: Add dialog implementation of Error applet
2019-03-11 23:39:20 +00:00
applets/error.cpp
applets/error.h
qt: Implement GUI dialog frontend for ProfileSelector Presents profiles in a list, similar to switch.
2018-11-23 02:03:33 +00:00
applets/profile_select.cpp
applets/profile_select.h
qt/applets: Provide Qt frontend implementation of software keyboard Implements all of the features of the keyboard, including length, default text, character validation, and UTF-16 character support.
2018-11-10 01:13:15 +00:00
applets/software_keyboard.cpp
applets/software_keyboard.h
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
applets/web_browser.cpp
applets/web_browser.h
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
bootmanager.cpp
bootmanager.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
compatdb.ui
yuzu: Move compatibility list specifics to their own source files Lets us keep the generic portions of the compatibility list code together, and allows us to introduce a type alias that makes it so we don't need to type out a very long type declaration anymore, making the immediate readability of some code better.
2018-09-09 23:09:37 +00:00
compatibility_list.cpp
compatibility_list.h
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/config.cpp
configuration/config.h
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
configuration/configuration_shared.cpp
configuration/configuration_shared.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure.ui
audio_core: Add configuration settings.
2018-07-31 03:57:53 +00:00
configuration/configure_audio.cpp
configuration/configure_audio.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_audio.ui
configuration: Add settings to enable/disable specific CPU optimizations
2020-07-11 13:26:36 +00:00
configuration/configure_cpu.cpp
configuration/configure_cpu.h
configuration/configure_cpu.ui
configure_cpu: Split optimization settings off into Debug tab
2020-07-12 11:06:04 +00:00
configuration/configure_cpu_debug.cpp
configuration/configure_cpu_debug.h
configuration/configure_cpu_debug.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_debug.cpp
configuration/configure_debug.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_debug.ui
Project Mjölnir: Part 1 Co-authored-by: James Rowe <jroweboy@gmail.com> Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-07-22 14:39:53 +00:00
configuration/configure_debug_controller.cpp
configuration/configure_debug_controller.h
configuration/configure_debug_controller.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_dialog.cpp
configuration/configure_dialog.h
yuzu: Add UI to manage filesystem paths and sizes
2019-04-23 12:36:35 +00:00
configuration/configure_filesystem.cpp
configuration/configure_filesystem.h
configure_debug: Move reporting option to logging
2019-09-21 22:43:11 +00:00
configuration/configure_filesystem.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_general.cpp
configuration/configure_general.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_general.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_graphics.cpp
configuration/configure_graphics.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_graphics.ui
Create an "Advanced" tab in the graphics configuration tab and add anisotropic filtering levels.
2020-02-24 00:01:17 +00:00
configuration/configure_graphics_advanced.cpp
configuration/configure_graphics_advanced.h
configuration/configure_graphics_advanced.ui
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
configuration/configure_hotkeys.cpp
configuration/configure_hotkeys.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_hotkeys.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_input.cpp
configuration/configure_input.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_input.ui
Project Mjölnir: Part 1 Co-authored-by: James Rowe <jroweboy@gmail.com> Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-07-22 14:39:53 +00:00
configuration/configure_input_advanced.cpp
configuration/configure_input_advanced.h
configuration/configure_input_advanced.ui
Project Mjölnir: Part 2 - Controller Applet Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-08-21 11:39:24 +00:00
configuration/configure_input_player.cpp
configuration/configure_input_player.h
configuration/configure_input_player.ui
Make settings controller image change with controller input
2021-01-13 03:09:59 +00:00
configuration/configure_input_player_widget.cpp
configuration/configure_input_player_widget.h
applets/controller: Change the input button to create input profiles Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-10-26 07:28:03 +00:00
configuration/configure_input_profile_dialog.cpp
configuration/configure_input_profile_dialog.h
configuration/configure_input_profile_dialog.ui
yuzu: Add motion and touch configuration
2020-07-14 17:01:36 +00:00
configuration/configure_motion_touch.cpp
configuration/configure_motion_touch.h
configuration/configure_motion_touch.ui
qt: Add UI to configure mouse buttons Supports setting the five mouse buttons to any valid controller button/keyboard key (Left, Right, Middle, Foward, Back)
2018-11-02 02:07:46 +00:00
configuration/configure_mouse_advanced.cpp
configuration/configure_mouse_advanced.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_mouse_advanced.ui
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
configuration/configure_per_game.cpp
configuration/configure_per_game.h
configuration/configure_per_game.ui
configuration/configure_per_game_addons.cpp
configuration/configure_per_game_addons.h
configuration/configure_per_game_addons.ui
qt: Move profile manager to own UI tab
2019-01-04 22:32:13 +00:00
configuration/configure_profile_manager.cpp
configuration/configure_profile_manager.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_profile_manager.ui
yuzu: Add UI tab to configure BCAT services Also displays current events if boxcat is selected.
2019-04-28 23:01:23 +00:00
configuration/configure_service.cpp
configuration/configure_service.h
qt: Add service dialog
2019-10-02 12:35:39 +00:00
configuration/configure_service.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
configuration/configure_system.cpp
configuration/configure_system.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_system.ui
yuzu: Add motion and touch configuration
2020-07-14 17:01:36 +00:00
configuration/configure_touch_from_button.cpp
configuration/configure_touch_from_button.h
configuration/configure_touch_from_button.ui
qt: Add UI to configure touchscreen parameters This allows adjusting the finger, diameter, and angle of the emulated touchscreen. It also provides a warning to the user about what changing these parameters can do.
2018-11-02 02:10:51 +00:00
configuration/configure_touchscreen_advanced.cpp
configuration/configure_touchscreen_advanced.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_touchscreen_advanced.ui
yuzu: Add motion and touch configuration
2020-07-14 17:01:36 +00:00
configuration/configure_touch_widget.h
yuzu/configuration: create UI tab and move gamelist settings there
2020-01-23 23:15:51 +00:00
configuration/configure_ui.cpp
configuration/configure_ui.h
configuration/configure_ui.ui
configure_input: Add per-player vibration Allows for enabling and modifying vibration and vibration strength per player. Also adds a toggle for enabling/disabling accurate vibrations. Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-10-17 13:38:12 +00:00
configuration/configure_vibration.cpp
configuration/configure_vibration.h
configuration/configure_vibration.ui
Port web_service from Citra
2018-09-16 18:05:51 +00:00
configuration/configure_web.cpp
configuration/configure_web.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
configuration/configure_web.ui
input_profiles: Implement input profiles
2020-09-23 13:52:25 +00:00
configuration/input_profiles.cpp
configuration/input_profiles.h
Add configurable logging backends
2018-07-02 17:10:41 +00:00
debugger/console.cpp
debugger/console.h
Add controller window and single joycon top view
2021-01-22 00:51:24 +00:00
debugger/controller.cpp
debugger/controller.h
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
debugger/profiler.cpp
debugger/profiler.h
debugger/wait_tree.cpp
debugger/wait_tree.h
Port web_service from Citra
2018-09-16 18:05:51 +00:00
discord.h
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
game_list.cpp
game_list.h
game_list_p.h
yuzu: Move GameListWorker to its own source files This has gotten sufficiently large enough to warrant moving it to its own source files. Especially given it dumps the file_sys headers around code that doesn't use it for the most part. This'll also make it easier to introduce a type alias for the compatibility list, so a large unordered_map type declaration doesn't need to be specified all the time (we don't want to propagate the game_list_p.h include via the main game_list.h header).
2018-09-07 20:08:08 +00:00
game_list_worker.cpp
game_list_worker.h
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
hotkeys.cpp
hotkeys.h
install_dialog.cpp
install_dialog.h
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
loading_screen.cpp
loading_screen.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
loading_screen.ui
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
main.cpp
main.h
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
main.ui
uisettings.cpp
uisettings.h
configure_system: Contrain profile usernames to 32 characters Previously, we would let a user enter an unbounded name and then silently truncate away characters that went over the 32-character limit. This is kind of bad from the UX point of view, because we're essentially not doing what the user intended in certain scenarios. Instead, we clamp it to 32 characters and make that visually apparent in the dialog box to provide a name for a user.
2018-10-28 22:11:17 +00:00
util/limitable_input_dialog.cpp
util/limitable_input_dialog.h
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
util/sequence_dialog/sequence_dialog.cpp
util/sequence_dialog/sequence_dialog.h
util: Add URL Request Interceptor for QWebEngine
2020-11-23 05:06:31 +00:00
util/url_request_interceptor.cpp
util/url_request_interceptor.h
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
util/util.cpp
util/util.h
Port web_service from Citra
2018-09-16 18:05:51 +00:00
compatdb.cpp
compatdb.h
yuzu: Various frontend improvements to avoid crashes and improve experience on Linux.
2021-02-14 08:20:41 +00:00
yuzu.qrc
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
yuzu.rc
)
Basic QT window
2014-04-01 02:26:50 +00:00
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
file(GLOB COMPAT_LIST
CMakeLists: Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR This is more localized to what we want to enforce directory-wise with the project. CMAKE_SOURCE_DIR indicates the root of the source tree, but this would cause the wrong behavior if someone included yuzu as part of a larger buildsystem (for whatever reason). Instead, we want to use the directory where the "project(yuzu)" command was declared as the root path reference.
2018-10-20 21:08:26 +00:00
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*)
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*)
citra-qt: Add Dark theme from https://github.com/ColinDuquesnoy/QDarkStyleSheet
2017-06-24 00:39:42 +00:00
yuzu: Port translation support from Citra Co-Authored-By: Weiyi Wang <wwylele@gmail.com>
2020-01-25 23:26:07 +00:00
if (ENABLE_QT_TRANSLATION)
set(YUZU_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend")
option(GENERATE_QT_TRANSLATION "Generate en.ts as the translation source file" OFF)
# Update source TS file if enabled
if (GENERATE_QT_TRANSLATION)
get_target_property(SRCS yuzu SOURCES)
qt5_create_translation(QM_FILES ${SRCS} ${UIS} ${YUZU_QT_LANGUAGES}/en.ts)
add_custom_target(translation ALL DEPENDS ${YUZU_QT_LANGUAGES}/en.ts)
endif()
# Find all TS files except en.ts
file(GLOB_RECURSE LANGUAGES_TS ${YUZU_QT_LANGUAGES}/*.ts)
list(REMOVE_ITEM LANGUAGES_TS ${YUZU_QT_LANGUAGES}/en.ts)
# Compile TS files to QM files
qt5_add_translation(LANGUAGES_QM ${LANGUAGES_TS})
# Build a QRC file from the QM file list
set(LANGUAGES_QRC ${CMAKE_CURRENT_BINARY_DIR}/languages.qrc)
file(WRITE ${LANGUAGES_QRC} "<RCC><qresource prefix=\"languages\">\n")
foreach (QM ${LANGUAGES_QM})
get_filename_component(QM_FILE ${QM} NAME)
file(APPEND ${LANGUAGES_QRC} "<file>${QM_FILE}</file>\n")
endforeach (QM)
file(APPEND ${LANGUAGES_QRC} "</qresource></RCC>")
# Add the QRC file to package in all QM files
qt5_add_resources(LANGUAGES ${LANGUAGES_QRC})
else()
set(LANGUAGES)
endif()
Basic QT window
2014-04-01 02:26:50 +00:00
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
target_sources(yuzu
PRIVATE
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
${COMPAT_LIST}
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
${ICONS}
yuzu: Port translation support from Citra Co-Authored-By: Weiyi Wang <wwylele@gmail.com>
2020-01-25 23:26:07 +00:00
${LANGUAGES}
Address trivial review comments.
2020-02-15 16:21:19 +00:00
${THEMES}
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
)
Build app bundles on OS X. Fixes the issue where the menubar would not appear.
2015-03-08 00:07:49 +00:00
if (APPLE)
Add new icons and fix up the linux paths for install
2018-01-13 22:39:31 +00:00
set(MACOSX_ICON "../../dist/yuzu.icns")
citra-qt: Add icon to Mac app Previously the Mac app didn't have any icon.
2015-09-11 20:08:42 +00:00
set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
target_sources(yuzu PRIVATE ${MACOSX_ICON})
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
Massive removal of unused modules
2018-01-12 02:21:20 +00:00
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
Add configurable logging backends
2018-07-02 17:10:41 +00:00
elseif(WIN32)
# compile as a win32 gui application instead of a console application
target_link_libraries(yuzu PRIVATE Qt5::WinMain)
if(MSVC)
set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
elseif(MINGW)
set_target_properties(yuzu PROPERTIES LINK_FLAGS_RELEASE "-mwindows")
endif()
Build app bundles on OS X. Fixes the issue where the menubar would not appear.
2015-03-08 00:07:49 +00:00
endif()
CMakeLists: Derive the source directory grouping from targets themselves Removes the need to store to separate SRC and HEADER variables, and then construct the target in most cases.
2018-01-18 00:37:34 +00:00
create_target_directory_groups(yuzu)
Massive removal of unused modules
2018-01-12 02:21:20 +00:00
target_link_libraries(yuzu PRIVATE common core input_common video_core)
cmake: stop linking against QGL after c6a0ab979239
2020-07-01 22:00:47 +00:00
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets)
Massive removal of unused modules
2018-01-12 02:21:20 +00:00
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
Basic QT window
2014-04-01 02:26:50 +00:00
cmake: Always enable Vulkan Removes the unnecesary burden of maintaining separate #ifdef paths and allows us sharing generic Vulkan code across APIs.
2020-12-24 23:22:07 +00:00
target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
if (NOT WIN32)
yuzu: Drop SDL2 and Qt frontend Vulkan requirements Create Vulkan instances and surfaces from the Vulkan backend.
2020-04-02 05:32:58 +00:00
target_include_directories(yuzu PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
endif()
CMakeLists: Define QT_USE_QSTRINGBUILDER for the Qt target This is a compile definition introduced in Qt 4.8 for reducing the total potential number of strings created when performing string concatenation. This allows for less memory churn. This can be read about here: https://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/ For a change that isn't source-compatible, we only had one occurrence that actually need to have its type clarified, which is pretty good, as far as transitioning goes.
2019-04-15 21:50:27 +00:00
target_compile_definitions(yuzu PRIVATE
# Use QStringBuilder for string concatenation to reduce
# the overall number of temporary strings created.
-DQT_USE_QSTRINGBUILDER
yuzu/CMakeLists: Disable implicit QString conversions Now that all of our code is compilable with implicit QString conversions, we can enforce it at compile-time by disabling them.
2019-05-25 01:08:27 +00:00
# Disable implicit conversions from/to C strings
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_CAST_TO_ASCII
yuzu/CMakeLists: Disable implicit type narrowing in connect() calls Prevents hard-to-diagnose bugs from potentially occurring and requires any type narrowing to be explicitly performed by our code.
2019-06-05 19:43:55 +00:00
# Disable implicit type narrowing in signal/slot connect() calls.
-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
yuzu/CMakeLists: Disable unsafe overloads of QProcess' start() function Other overloads of start() are considerably much safer to use if we ever need this in the future and need to pass arguments to the program, given it contains separate parameters for the program path and the arguments themselves, whereas this unsafe overload contains both as a single string. Given the alternatives are much safer, we can disable this.
2019-06-05 19:47:42 +00:00
# Disable unsafe overloads of QProcess' start() function.
-DQT_NO_PROCESS_COMBINED_ARGUMENT_START
yuzu/CMakeLists: Disable implicit QString->QUrl conversions Enforces the use of the proper URL resolution functions. e.g. url = some_local_path_string; should actually be: url = QUrl::fromLocalPath(some_local_path_string); etc. This makes it harder to cause bugs when operating with both strings and URLs at the same time.
2019-06-05 20:05:34 +00:00
# Disable implicit QString->QUrl conversions to enforce use of proper resolving functions.
-DQT_NO_URL_CAST_FROM_STRING
CMakeLists: Define QT_USE_QSTRINGBUILDER for the Qt target This is a compile definition introduced in Qt 4.8 for reducing the total potential number of strings created when performing string concatenation. This allows for less memory churn. This can be read about here: https://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/ For a change that isn't source-compatible, we only had one occurrence that actually need to have its type clarified, which is pretty good, as far as transitioning goes.
2019-04-15 21:50:27 +00:00
)
Review comments -part 4
2018-09-29 00:51:28 +00:00
if (YUZU_ENABLE_COMPATIBILITY_REPORTING)
CMakeLists: Use target_compile_definitions instead of add_definitions to define YUZU_ENABLE_COMPATIBILITY_REPORTING Keeps the definition constrained to the yuzu target and prevents polluting anything else in the same directory (should that ever happen). It also keeps it consistent with how the USE_DISCORD_PRESENCE definition is introduced below it.
2018-10-20 21:28:27 +00:00
target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_COMPATIBILITY_REPORTING)
Review comments -part 4
2018-09-29 00:51:28 +00:00
endif()
Port web_service from Citra
2018-09-16 18:05:51 +00:00
if (USE_DISCORD_PRESENCE)
target_sources(yuzu PUBLIC
discord_impl.cpp
discord_impl.h
)
target_link_libraries(yuzu PRIVATE discord-rpc)
target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE)
endif()
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
if (YUZU_USE_QT_WEB_ENGINE)
target_link_libraries(yuzu PRIVATE Qt5::WebEngineCore Qt5::WebEngineWidgets)
target_compile_definitions(yuzu PRIVATE -DYUZU_USE_QT_WEB_ENGINE)
endif ()
yuzu: Add UI tab to configure BCAT services Also displays current events if boxcat is selected.
2019-04-28 23:01:23 +00:00
if (YUZU_ENABLE_BOXCAT)
target_compile_definitions(yuzu PRIVATE -DYUZU_ENABLE_BOXCAT)
endif ()
build: add default install for DragonFly, Solaris, etc.
2016-10-10 05:58:05 +00:00
if(UNIX AND NOT APPLE)
Massive removal of unused modules
2018-01-12 02:21:20 +00:00
install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
Citra, CitraQt: Tell cmake to install the compiled binaries. This will help packaging tremendously, as a `make DESTDIR=… install` will now put every file at their place (on Linux and related).
2015-07-09 19:19:02 +00:00
endif()
More changes to the CMakeFiles for better MSVC compatibility. Added in the RelWithDebInfo target and setup copying the Qt 5 Dlls to the output directories.
2015-02-26 04:36:02 +00:00
Removed redundant Qt check and other fixes This removes a redundant check and moves part of the code to a separate function.
2016-12-11 14:10:21 +00:00
if (MSVC)
yuzu qt copy windows deps renamed
2018-01-14 04:17:42 +00:00
include(CopyYuzuQt5Deps)
include(CopyYuzuSDLDeps)
video_core: NVDEC Implementation This commit aims to implement the NVDEC (Nvidia Decoder) functionality, with video frame decoding being handled by the FFmpeg library. The process begins with Ioctl commands being sent to the NVDEC and VIC (Video Image Composer) emulated devices. These allocate the necessary GPU buffers for the frame data, along with providing information on the incoming video data. A Submit command then signals the GPU to process and decode the frame data. To decode the frame, the respective codec's header must be manually composed from the information provided by NVDEC, then sent with the raw frame data to the ffmpeg library. Currently, H264 and VP9 are supported, with VP9 having some minor artifacting issues related mainly to the reference frame composition in its uncompressed header. Async GPU is not properly implemented at the moment. Co-Authored-By: David <25727384+ogniK5377@users.noreply.github.com>
2020-10-27 03:07:36 +00:00
include(CopyYuzuFFmpegDeps)
Fix build on macOS and linux
2018-01-13 22:14:04 +00:00
copy_yuzu_Qt5_deps(yuzu)
copy_yuzu_SDL_deps(yuzu)
video_core: NVDEC Implementation This commit aims to implement the NVDEC (Nvidia Decoder) functionality, with video frame decoding being handled by the FFmpeg library. The process begins with Ioctl commands being sent to the NVDEC and VIC (Video Image Composer) emulated devices. These allocate the necessary GPU buffers for the frame data, along with providing information on the incoming video data. A Submit command then signals the GPU to process and decode the frame data. To decode the frame, the respective codec's header must be manually composed from the information provided by NVDEC, then sent with the raw frame data to the ffmpeg library. Currently, H264 and VP9 are supported, with VP9 having some minor artifacting issues related mainly to the reference frame composition in its uncompressed header. Async GPU is not properly implemented at the moment. Co-Authored-By: David <25727384+ogniK5377@users.noreply.github.com>
2020-10-27 03:07:36 +00:00
copy_yuzu_FFmpeg_deps(yuzu)
More changes to the CMakeFiles for better MSVC compatibility. Added in the RelWithDebInfo target and setup copying the Qt 5 Dlls to the output directories.
2015-02-26 04:36:02 +00:00
endif()
yuzu: Implement Vulkan frontend Adds a Qt and SDL2 frontend for Vulkan. It also finishes the missing bits on Vulkan initialization.
2020-01-21 19:40:53 +00:00
bootmanager: Remove references to OpenGL for macOS OpenGL macOS headers definitions clash heavily with each other
2020-06-17 11:37:15 +00:00
if (NOT APPLE)
target_compile_definitions(yuzu PRIVATE HAS_OPENGL)
endif()