From 9ca6b5430fb358b39f21ce0b2fc0268de954dd23 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 1 Sep 2024 22:08:31 +1000 Subject: [PATCH] Misc: Update copyright headers --- LICENSE | 719 ++---------------- README.md | 4 +- data/LICENSE.txt | 719 ++---------------- data/resources/thirdparty.html | 13 +- src/common-tests/bitutils_tests.cpp | 6 +- src/common-tests/file_system_tests.cpp | 3 +- src/common-tests/gsvector_yuvtorgb_test.cpp | 2 +- src/common-tests/path_tests.cpp | 5 +- src/common-tests/rectangle_tests.cpp | 5 +- src/common-tests/string_tests.cpp | 5 +- src/common/align.h | 2 +- src/common/assert.cpp | 2 +- src/common/assert.h | 4 +- src/common/binary_reader_writer.cpp | 4 +- src/common/binary_reader_writer.h | 4 +- src/common/bitfield.h | 4 +- src/common/bitutils.h | 4 +- src/common/cocoa_tools.h | 4 +- src/common/cocoa_tools.mm | 16 +- src/common/crash_handler.cpp | 4 +- src/common/crash_handler.h | 2 +- src/common/dynamic_library.cpp | 2 +- src/common/dynamic_library.h | 2 +- src/common/easing.h | 4 +- src/common/error.cpp | 2 +- src/common/error.h | 2 +- src/common/fastjmp.cpp | 4 +- src/common/fastjmp.h | 4 +- src/common/fastjmp_arm.asm | 4 +- src/common/fastjmp_x86.asm | 4 +- src/common/fifo_queue.h | 2 +- src/common/file_system.cpp | 2 +- src/common/file_system.h | 2 +- src/common/gsvector.cpp | 2 +- src/common/gsvector.h | 2 +- src/common/gsvector_formatter.h | 4 +- src/common/gsvector_neon.h | 4 +- src/common/gsvector_nosimd.h | 2 +- src/common/gsvector_sse.h | 2 +- src/common/hash_combine.h | 6 +- src/common/heap_array.h | 2 +- src/common/heterogeneous_containers.h | 4 +- src/common/intrin.h | 4 +- src/common/layered_settings_interface.cpp | 2 +- src/common/layered_settings_interface.h | 2 +- src/common/log.cpp | 4 +- src/common/log.h | 4 +- src/common/lru_cache.h | 4 +- src/common/md5_digest.cpp | 28 +- src/common/md5_digest.h | 3 +- src/common/memmap.cpp | 2 +- src/common/memmap.h | 2 +- src/common/memory_settings_interface.cpp | 2 +- src/common/memory_settings_interface.h | 2 +- src/common/minizip_helpers.h | 2 +- src/common/path.h | 2 +- src/common/perf_scope.cpp | 5 +- src/common/perf_scope.h | 4 +- src/common/progress_callback.cpp | 2 +- src/common/progress_callback.h | 2 +- src/common/scoped_guard.h | 4 +- src/common/settings_interface.h | 2 +- src/common/sha1_digest.cpp | 2 +- src/common/sha1_digest.h | 2 +- src/common/small_string.cpp | 2 +- src/common/small_string.h | 3 +- src/common/string_util.cpp | 2 +- src/common/string_util.h | 3 +- src/common/threading.cpp | 4 +- src/common/threading.h | 4 +- src/common/timer.cpp | 4 +- src/common/timer.h | 4 +- src/common/types.h | 3 +- src/common/windows_headers.h | 4 +- src/core/achievements.cpp | 2 +- src/core/achievements.h | 2 +- src/core/achievements_private.h | 4 +- src/core/analog_controller.cpp | 4 +- src/core/analog_controller.h | 2 +- src/core/analog_joystick.cpp | 4 +- src/core/analog_joystick.h | 2 +- src/core/bios.cpp | 2 +- src/core/bios.h | 2 +- src/core/bus.cpp | 2 +- src/core/bus.h | 2 +- src/core/cdrom.cpp | 2 +- src/core/cdrom.h | 4 +- src/core/cdrom_async_reader.cpp | 4 +- src/core/cdrom_async_reader.h | 4 +- src/core/cheats.cpp | 2 +- src/core/cheats.h | 2 +- src/core/controller.cpp | 2 +- src/core/controller.h | 2 +- src/core/cpu_code_cache.cpp | 2 +- src/core/cpu_code_cache.h | 2 +- src/core/cpu_code_cache_private.h | 4 +- src/core/cpu_core.cpp | 2 +- src/core/cpu_core.h | 2 +- src/core/cpu_core_private.h | 2 +- src/core/cpu_disasm.cpp | 4 +- src/core/cpu_disasm.h | 4 +- src/core/cpu_newrec_compiler.cpp | 13 +- src/core/cpu_newrec_compiler.h | 6 +- src/core/cpu_newrec_compiler_aarch32.cpp | 14 +- src/core/cpu_newrec_compiler_aarch32.h | 5 +- src/core/cpu_newrec_compiler_aarch64.cpp | 14 +- src/core/cpu_newrec_compiler_aarch64.h | 6 +- src/core/cpu_newrec_compiler_riscv64.cpp | 4 +- src/core/cpu_newrec_compiler_riscv64.h | 6 +- src/core/cpu_newrec_compiler_x64.cpp | 14 +- src/core/cpu_newrec_compiler_x64.h | 6 +- src/core/cpu_pgxp.cpp | 4 +- src/core/cpu_pgxp.h | 4 +- src/core/cpu_recompiler_code_generator.cpp | 8 +- src/core/cpu_recompiler_code_generator.h | 4 +- .../cpu_recompiler_code_generator_aarch32.cpp | 12 +- .../cpu_recompiler_code_generator_aarch64.cpp | 12 +- .../cpu_recompiler_code_generator_generic.cpp | 8 +- .../cpu_recompiler_code_generator_x64.cpp | 4 +- src/core/cpu_recompiler_register_cache.cpp | 9 +- src/core/cpu_recompiler_register_cache.h | 8 +- src/core/cpu_recompiler_thunks.h | 5 +- src/core/cpu_recompiler_types.h | 5 +- src/core/cpu_types.cpp | 4 +- src/core/cpu_types.h | 7 +- src/core/digital_controller.cpp | 4 +- src/core/digital_controller.h | 4 +- src/core/dma.cpp | 2 +- src/core/dma.h | 5 +- src/core/fullscreen_ui.cpp | 2 +- src/core/fullscreen_ui.h | 4 +- src/core/game_database.cpp | 2 +- src/core/game_database.h | 2 +- src/core/game_list.cpp | 2 +- src/core/game_list.h | 4 +- src/core/gdb_server.cpp | 2 +- src/core/gdb_server.h | 2 +- src/core/gpu.cpp | 2 +- src/core/gpu.h | 3 +- src/core/gpu_backend.cpp | 11 +- src/core/gpu_backend.h | 2 +- src/core/gpu_commands.cpp | 2 +- src/core/gpu_hw.cpp | 2 +- src/core/gpu_hw.h | 2 +- src/core/gpu_hw_shadergen.cpp | 5 +- src/core/gpu_hw_shadergen.h | 2 +- src/core/gpu_shadergen.cpp | 4 +- src/core/gpu_shadergen.h | 4 +- src/core/gpu_sw.cpp | 2 +- src/core/gpu_sw.h | 2 +- src/core/gpu_sw_backend.cpp | 2 +- src/core/gpu_sw_backend.h | 2 +- src/core/gpu_sw_rasterizer.cpp | 2 +- src/core/gpu_sw_rasterizer.h | 2 +- src/core/gpu_sw_rasterizer.inl | 2 +- src/core/gpu_sw_rasterizer_avx2.cpp | 4 +- src/core/gpu_types.h | 2 +- src/core/gte.cpp | 4 +- src/core/gte.h | 4 +- src/core/gte_types.h | 4 +- src/core/guncon.cpp | 4 +- src/core/guncon.h | 2 +- src/core/host.cpp | 2 +- src/core/host.h | 2 +- src/core/host_interface_progress_callback.cpp | 6 +- src/core/host_interface_progress_callback.h | 2 +- src/core/hotkeys.cpp | 2 +- src/core/imgui_overlays.cpp | 2 +- src/core/imgui_overlays.h | 4 +- src/core/input_types.h | 4 +- src/core/interrupt_controller.cpp | 2 +- src/core/interrupt_controller.h | 2 +- src/core/justifier.cpp | 2 +- src/core/justifier.h | 2 +- src/core/mdec.cpp | 2 +- src/core/mdec.h | 5 +- src/core/memory_card.cpp | 2 +- src/core/memory_card.h | 2 +- src/core/memory_card_image.cpp | 2 +- src/core/memory_card_image.h | 2 +- src/core/multitap.cpp | 2 +- src/core/multitap.h | 2 +- src/core/negcon.cpp | 2 +- src/core/negcon.h | 2 +- src/core/negcon_rumble.cpp | 2 +- src/core/negcon_rumble.h | 2 +- src/core/pad.cpp | 2 +- src/core/pad.h | 4 +- src/core/pcdrv.cpp | 4 +- src/core/pcdrv.h | 4 +- src/core/pch.cpp | 4 +- src/core/pch.h | 4 +- src/core/pine_server.cpp | 4 +- src/core/pine_server.h | 2 +- src/core/playstation_mouse.cpp | 4 +- src/core/playstation_mouse.h | 2 +- src/core/psf_loader.cpp | 2 +- src/core/psf_loader.h | 2 +- src/core/save_state_version.h | 2 +- src/core/settings.cpp | 2 +- src/core/settings.h | 2 +- src/core/shader_cache_version.h | 2 +- src/core/sio.cpp | 2 +- src/core/sio.h | 4 +- src/core/spu.cpp | 2 +- src/core/spu.h | 2 +- src/core/system.cpp | 2 +- src/core/system.h | 2 +- src/core/texture_replacements.cpp | 2 +- src/core/texture_replacements.h | 2 +- src/core/timers.cpp | 4 +- src/core/timers.h | 4 +- src/core/timing_event.cpp | 2 +- src/core/timing_event.h | 2 +- src/core/types.h | 4 +- src/duckstation-qt/aboutdialog.cpp | 6 +- src/duckstation-qt/aboutdialog.h | 4 +- src/duckstation-qt/achievementlogindialog.cpp | 4 +- src/duckstation-qt/achievementlogindialog.h | 4 +- .../achievementsettingswidget.cpp | 4 +- .../achievementsettingswidget.h | 4 +- src/duckstation-qt/advancedsettingswidget.cpp | 4 +- src/duckstation-qt/advancedsettingswidget.h | 4 +- src/duckstation-qt/audiosettingswidget.cpp | 2 +- src/duckstation-qt/audiosettingswidget.h | 2 +- src/duckstation-qt/autoupdaterdialog.cpp | 38 +- src/duckstation-qt/autoupdaterdialog.h | 2 +- src/duckstation-qt/biossettingswidget.cpp | 4 +- src/duckstation-qt/biossettingswidget.h | 4 +- src/duckstation-qt/cheatcodeeditordialog.cpp | 4 +- src/duckstation-qt/cheatcodeeditordialog.h | 4 +- src/duckstation-qt/cheatmanagerwindow.cpp | 2 +- src/duckstation-qt/cheatmanagerwindow.h | 2 +- src/duckstation-qt/colorpickerbutton.cpp | 4 +- src/duckstation-qt/colorpickerbutton.h | 4 +- src/duckstation-qt/consolesettingswidget.cpp | 2 +- src/duckstation-qt/consolesettingswidget.h | 4 +- .../controllerbindingwidgets.cpp | 2 +- src/duckstation-qt/controllerbindingwidgets.h | 2 +- .../controllerglobalsettingswidget.cpp | 2 +- .../controllerglobalsettingswidget.h | 4 +- .../controllersettingswindow.cpp | 2 +- src/duckstation-qt/controllersettingswindow.h | 2 +- .../controllersettingwidgetbinder.h | 4 +- src/duckstation-qt/coverdownloaddialog.cpp | 2 +- src/duckstation-qt/coverdownloaddialog.h | 4 +- src/duckstation-qt/debuggermodels.cpp | 2 +- src/duckstation-qt/debuggermodels.h | 2 +- src/duckstation-qt/debuggerwindow.cpp | 2 +- src/duckstation-qt/debuggerwindow.h | 2 +- src/duckstation-qt/displaywidget.cpp | 2 +- src/duckstation-qt/displaywidget.h | 4 +- .../emulationsettingswidget.cpp | 2 +- src/duckstation-qt/emulationsettingswidget.h | 4 +- src/duckstation-qt/foldersettingswidget.cpp | 4 +- src/duckstation-qt/foldersettingswidget.h | 4 +- src/duckstation-qt/gamelistmodel.cpp | 2 +- src/duckstation-qt/gamelistmodel.h | 2 +- src/duckstation-qt/gamelistrefreshthread.cpp | 2 +- src/duckstation-qt/gamelistrefreshthread.h | 2 +- src/duckstation-qt/gamelistsettingswidget.cpp | 2 +- src/duckstation-qt/gamelistsettingswidget.h | 2 +- src/duckstation-qt/gamelistwidget.cpp | 2 +- src/duckstation-qt/gamelistwidget.h | 4 +- src/duckstation-qt/gamesummarywidget.cpp | 2 +- src/duckstation-qt/gamesummarywidget.h | 4 +- src/duckstation-qt/graphicssettingswidget.cpp | 2 +- src/duckstation-qt/graphicssettingswidget.h | 2 +- src/duckstation-qt/hotkeysettingswidget.cpp | 4 +- src/duckstation-qt/hotkeysettingswidget.h | 4 +- src/duckstation-qt/inputbindingdialog.cpp | 2 +- src/duckstation-qt/inputbindingdialog.h | 2 +- src/duckstation-qt/inputbindingwidgets.cpp | 4 +- src/duckstation-qt/inputbindingwidgets.h | 4 +- .../interfacesettingswidget.cpp | 2 +- src/duckstation-qt/interfacesettingswidget.h | 2 +- src/duckstation-qt/logwindow.cpp | 4 +- src/duckstation-qt/logwindow.h | 4 +- src/duckstation-qt/mainwindow.cpp | 2 +- src/duckstation-qt/mainwindow.h | 2 +- src/duckstation-qt/memorycardeditorwindow.cpp | 2 +- src/duckstation-qt/memorycardeditorwindow.h | 4 +- .../memorycardsettingswidget.cpp | 4 +- src/duckstation-qt/memorycardsettingswidget.h | 5 +- src/duckstation-qt/memoryscannerwindow.cpp | 16 +- src/duckstation-qt/memoryscannerwindow.h | 2 +- src/duckstation-qt/pch.cpp | 4 +- src/duckstation-qt/pch.h | 4 +- .../postprocessingsettingswidget.cpp | 4 +- .../postprocessingsettingswidget.h | 2 +- src/duckstation-qt/qthost.cpp | 2 +- src/duckstation-qt/qthost.h | 2 +- src/duckstation-qt/qtkeycodes.cpp | 4 +- src/duckstation-qt/qtprogresscallback.cpp | 2 +- src/duckstation-qt/qtprogresscallback.h | 2 +- src/duckstation-qt/qtthemes.cpp | 2 +- src/duckstation-qt/qttranslations.cpp | 2 +- src/duckstation-qt/qtutils.cpp | 2 +- src/duckstation-qt/qtutils.h | 2 +- src/duckstation-qt/selectdiscdialog.cpp | 4 +- src/duckstation-qt/selectdiscdialog.h | 4 +- src/duckstation-qt/settingswindow.cpp | 7 +- src/duckstation-qt/settingswindow.h | 2 +- src/duckstation-qt/settingswindow.ui | 47 +- src/duckstation-qt/settingwidgetbinder.h | 2 +- src/duckstation-qt/setupwizarddialog.cpp | 4 +- src/duckstation-qt/setupwizarddialog.h | 4 +- src/duckstation-qt/vcruntimecheck.cpp | 2 +- src/duckstation-regtest/regtest_host.cpp | 2 +- src/scmversion/scmversion.h | 4 +- src/updater/Info.plist.in | 2 +- src/updater/cocoa_main.mm | 4 +- src/updater/cocoa_progress_callback.h | 2 +- src/updater/cocoa_progress_callback.mm | 2 +- src/updater/updater.cpp | 2 +- src/updater/updater.h | 4 +- src/updater/win32_main.cpp | 2 +- src/updater/win32_progress_callback.cpp | 2 +- src/updater/win32_progress_callback.h | 2 +- src/util/cd_image.cpp | 4 +- src/util/cd_image.h | 2 +- src/util/cd_image_bin.cpp | 2 +- src/util/cd_image_chd.cpp | 2 +- src/util/cd_image_cue.cpp | 4 +- src/util/cd_image_device.cpp | 2 +- src/util/cd_image_ecm.cpp | 2 +- src/util/cd_image_hasher.cpp | 2 +- src/util/cd_image_hasher.h | 4 +- src/util/cd_image_m3u.cpp | 4 +- src/util/cd_image_mds.cpp | 2 +- src/util/cd_image_memory.cpp | 4 +- src/util/cd_image_pbp.cpp | 2 +- src/util/cd_image_ppf.cpp | 2 +- src/util/cd_subchannel_replacement.cpp | 4 +- src/util/cd_subchannel_replacement.h | 4 +- src/util/compress_helpers.cpp | 2 +- src/util/compress_helpers.h | 2 +- src/util/cubeb_audio_stream.cpp | 2 +- src/util/cue_parser.cpp | 4 +- src/util/cue_parser.h | 4 +- src/util/d3d11_device.cpp | 4 +- src/util/d3d11_device.h | 2 +- src/util/d3d11_pipeline.cpp | 2 +- src/util/d3d11_pipeline.h | 4 +- src/util/d3d11_stream_buffer.cpp | 2 +- src/util/d3d11_stream_buffer.h | 2 +- src/util/d3d11_texture.cpp | 2 +- src/util/d3d11_texture.h | 2 +- src/util/d3d12_builders.cpp | 2 +- src/util/d3d12_builders.h | 2 +- src/util/d3d12_descriptor_heap_manager.cpp | 2 +- src/util/d3d12_descriptor_heap_manager.h | 2 +- src/util/d3d12_device.cpp | 2 +- src/util/d3d12_device.h | 2 +- src/util/d3d12_pipeline.cpp | 2 +- src/util/d3d12_pipeline.h | 4 +- src/util/d3d12_stream_buffer.cpp | 2 +- src/util/d3d12_stream_buffer.h | 2 +- src/util/d3d12_texture.cpp | 2 +- src/util/d3d12_texture.h | 2 +- src/util/d3d_common.cpp | 2 +- src/util/d3d_common.h | 2 +- src/util/dinput_source.cpp | 4 +- src/util/dinput_source.h | 4 +- src/util/gpu_device.cpp | 2 +- src/util/gpu_device.h | 2 +- src/util/gpu_framebuffer_manager.h | 2 +- src/util/gpu_shader_cache.cpp | 4 +- src/util/gpu_shader_cache.h | 4 +- src/util/gpu_texture.cpp | 2 +- src/util/gpu_texture.h | 2 +- src/util/host.cpp | 4 +- src/util/host.h | 2 +- src/util/http_downloader.cpp | 4 +- src/util/http_downloader.h | 4 +- src/util/http_downloader_curl.cpp | 4 +- src/util/http_downloader_curl.h | 4 +- src/util/http_downloader_winhttp.cpp | 4 +- src/util/http_downloader_winhttp.h | 4 +- src/util/image.cpp | 2 +- src/util/image.h | 2 +- src/util/imgui_animated.h | 2 +- src/util/imgui_fullscreen.cpp | 2 +- src/util/imgui_fullscreen.h | 2 +- src/util/imgui_glyph_ranges.inl | 2 +- src/util/imgui_manager.cpp | 2 +- src/util/imgui_manager.h | 2 +- src/util/ini_settings_interface.cpp | 2 +- src/util/ini_settings_interface.h | 2 +- src/util/input_manager.cpp | 2 +- src/util/input_manager.h | 2 +- src/util/input_source.cpp | 4 +- src/util/input_source.h | 4 +- src/util/iso_reader.cpp | 4 +- src/util/iso_reader.h | 4 +- src/util/media_capture.cpp | 2 +- src/util/media_capture.h | 2 +- src/util/metal_device.h | 4 +- src/util/metal_device.mm | 4 +- src/util/metal_layer.h | 4 +- src/util/metal_stream_buffer.h | 4 +- src/util/metal_stream_buffer.mm | 4 +- src/util/opengl_context.cpp | 2 +- src/util/opengl_context.h | 2 +- src/util/opengl_context_agl.h | 2 +- src/util/opengl_context_agl.mm | 2 +- src/util/opengl_context_egl.cpp | 2 +- src/util/opengl_context_egl.h | 2 +- src/util/opengl_context_egl_wayland.cpp | 2 +- src/util/opengl_context_egl_wayland.h | 2 +- src/util/opengl_context_egl_x11.cpp | 2 +- src/util/opengl_context_egl_x11.h | 2 +- src/util/opengl_context_wgl.cpp | 2 +- src/util/opengl_context_wgl.h | 2 +- src/util/opengl_device.cpp | 2 +- src/util/opengl_device.h | 2 +- src/util/opengl_loader.h | 2 +- src/util/opengl_pipeline.cpp | 2 +- src/util/opengl_pipeline.h | 2 +- src/util/opengl_stream_buffer.cpp | 2 +- src/util/opengl_stream_buffer.h | 2 +- src/util/opengl_texture.cpp | 2 +- src/util/opengl_texture.h | 2 +- src/util/page_fault_handler.cpp | 2 +- src/util/page_fault_handler.h | 2 +- src/util/pch.cpp | 4 +- src/util/pch.h | 4 +- src/util/platform_misc.h | 2 +- src/util/platform_misc_mac.mm | 2 +- src/util/platform_misc_unix.cpp | 2 +- src/util/platform_misc_win32.cpp | 2 +- src/util/postprocessing.cpp | 4 +- src/util/postprocessing.h | 2 +- src/util/postprocessing_shader.cpp | 4 +- src/util/postprocessing_shader.h | 4 +- src/util/postprocessing_shader_fx.cpp | 2 +- src/util/postprocessing_shader_fx.h | 4 +- src/util/postprocessing_shader_glsl.cpp | 4 +- src/util/postprocessing_shader_glsl.h | 4 +- src/util/sdl_audio_stream.cpp | 2 +- src/util/sdl_input_source.cpp | 2 +- src/util/sdl_input_source.h | 2 +- src/util/shadergen.cpp | 2 +- src/util/shadergen.h | 2 +- src/util/sockets.cpp | 2 +- src/util/sockets.h | 2 +- src/util/state_wrapper.cpp | 4 +- src/util/state_wrapper.h | 2 +- src/util/vulkan_builders.cpp | 2 +- src/util/vulkan_builders.h | 2 +- src/util/vulkan_device.cpp | 2 +- src/util/vulkan_device.h | 2 +- src/util/vulkan_entry_points.h | 4 +- src/util/vulkan_entry_points.inl | 4 +- src/util/vulkan_loader.cpp | 4 +- src/util/vulkan_loader.h | 2 +- src/util/vulkan_pipeline.cpp | 2 +- src/util/vulkan_pipeline.h | 4 +- src/util/vulkan_stream_buffer.cpp | 4 +- src/util/vulkan_stream_buffer.h | 4 +- src/util/vulkan_swap_chain.cpp | 2 +- src/util/vulkan_swap_chain.h | 2 +- src/util/vulkan_texture.cpp | 2 +- src/util/vulkan_texture.h | 2 +- src/util/wav_writer.cpp | 4 +- src/util/wav_writer.h | 4 +- src/util/win32_raw_input_source.cpp | 2 +- src/util/win32_raw_input_source.h | 2 +- src/util/window_info.cpp | 2 +- src/util/window_info.h | 2 +- src/util/xinput_source.cpp | 4 +- src/util/xinput_source.h | 4 +- 472 files changed, 962 insertions(+), 2062 deletions(-) diff --git a/LICENSE b/LICENSE index 94a9ed024..adb475897 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,105 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +# PolyForm Strict License 1.0.0 - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + - Preamble +## Acceptance - The GNU General Public License is a free, copyleft license for -software and other kinds of works. +In order to get any license under these terms, you must agree +to them as both strict obligations and conditions to all +your licenses. - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +## Copyright License - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. +The licensor grants you a copyright license for the software +to do everything you might do with the software that would +otherwise infringe the licensor's copyright in it for any +permitted purpose, other than distributing the software or +making changes or new works based on the software. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. +## Patent License - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +The licensor grants you a patent license for the software that +covers patent claims the licensor can license, or becomes able +to license, that you would infringe by using the software. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. +## Noncommercial Purposes - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. +Any noncommercial purpose is a permitted purpose. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. +## Personal Uses - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. +Personal use for research, experiment, and testing for +the benefit of public knowledge, personal study, private +entertainment, hobby projects, amateur pursuits, or religious +observance, without any anticipated commercial application, +is use for a permitted purpose. - The precise terms and conditions for copying, distribution and -modification follow. +## Noncommercial Organizations - TERMS AND CONDITIONS +Use by any charitable organization, educational institution, +public research organization, public safety or health +organization, environmental protection organization, +or government institution is use for a permitted purpose +regardless of the source of funding or obligations resulting +from the funding. - 0. Definitions. +## Fair Use - "This License" refers to version 3 of the GNU General Public License. +You may have "fair use" rights for the software under the +law. These terms do not limit them. - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. +## No Other Rights - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. +These terms do not allow you to sublicense or transfer any of +your licenses to anyone else, or prevent the licensor from +granting licenses to anyone else. These terms do not imply +any other licenses. - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. +## Patent Defense - A "covered work" means either the unmodified Program or a work based -on the Program. +If you make any written claim that the software infringes or +contributes to infringement of any patent, your patent license +for the software granted under these terms ends immediately. If +your company makes such a claim, your patent license ends +immediately for work on behalf of your company. - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. +## Violations - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. +The first time you are notified in writing that you have +violated any of these terms, or done anything with the software +not covered by your licenses, your licenses can nonetheless +continue if you come into full compliance with these terms, +and take practical steps to correct past violations, within +32 days of receiving notice. Otherwise, all your licenses +end immediately. - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. +## No Liability - 1. Source Code. +***As far as the law allows, the software comes as is, without +any warranty or condition, and the licensor will not be liable +to you for any damages arising out of these terms or the use +or nature of the software, under any kind of legal claim.*** - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. +## Definitions - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. +The **licensor** is the individual or entity offering these +terms, and the **software** is the software the licensor makes +available under these terms. - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. +**You** refers to the individual or entity agreeing to these +terms. - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. +**Your company** is any legal entity, sole proprietorship, +or other kind of organization that you work for, plus all +organizations that have control over, are under the control of, +or are under common control with that organization. **Control** +means ownership of substantially all the assets of an entity, +or the power to direct its management and policies by vote, +contract, or otherwise. Control can be direct or indirect. - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. +**Your licenses** are all the licenses granted to you for the +software under these terms. - The Corresponding Source for a work in source code form is that -same work. +**Use** means anything you do with the software requiring one +of your licenses. - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md index 1a6627fc2..13b844f77 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Other features include: - SDL, XInput or DInput compatible game controller (e.g. XB360/XBOne/XBSeries). DualShock 3 users on Windows will need to install the official DualShock 3 drivers included as part of PlayStation Now. ## Downloading and running -Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push. Binaries or packages distributed through other sources may be out of date and are not supported by the developer, please speak to them for support, not us. +Binaries of DuckStation for Windows x64/ARM64, Linux x86_64 (in AppImage/Flatpak formats), and macOS Universal Binaries are available via GitHub Releases and are automatically built with every commit/push. We permit users to re-distribute official builds as-is **without modification**, however we would prefer if you linked to https://www.duckstation.org/ instead. For x86 machines (most systems), you will need a CPU that supports the SSE4.1 instruction set. This includes all CPUs manufactured after 2007. If you want to use DuckStation with a CPU that is older, [v0.1-6995](https://github.com/stenzek/duckstation/releases/tag/v0.1-6995) is the last version that does not require SSE4.1. @@ -86,8 +86,6 @@ The only supported version of DuckStation for Linux are the AppImage and Flatpak The release on [Flathub](https://flathub.org/apps/org.duckstation.DuckStation) is official, and synchronized with the latest rolling/stable release on GitHub. -You **should not** install DuckStation from unofficial repositories such as the AUR, they are **known to be broken**. - #### AppImage The AppImages require a distribution equivalent to Ubuntu 22.04 or newer to run. diff --git a/data/LICENSE.txt b/data/LICENSE.txt index 94a9ed024..adb475897 100644 --- a/data/LICENSE.txt +++ b/data/LICENSE.txt @@ -1,674 +1,105 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +# PolyForm Strict License 1.0.0 - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. + - Preamble +## Acceptance - The GNU General Public License is a free, copyleft license for -software and other kinds of works. +In order to get any license under these terms, you must agree +to them as both strict obligations and conditions to all +your licenses. - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +## Copyright License - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. +The licensor grants you a copyright license for the software +to do everything you might do with the software that would +otherwise infringe the licensor's copyright in it for any +permitted purpose, other than distributing the software or +making changes or new works based on the software. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. +## Patent License - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +The licensor grants you a patent license for the software that +covers patent claims the licensor can license, or becomes able +to license, that you would infringe by using the software. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. +## Noncommercial Purposes - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. +Any noncommercial purpose is a permitted purpose. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. +## Personal Uses - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. +Personal use for research, experiment, and testing for +the benefit of public knowledge, personal study, private +entertainment, hobby projects, amateur pursuits, or religious +observance, without any anticipated commercial application, +is use for a permitted purpose. - The precise terms and conditions for copying, distribution and -modification follow. +## Noncommercial Organizations - TERMS AND CONDITIONS +Use by any charitable organization, educational institution, +public research organization, public safety or health +organization, environmental protection organization, +or government institution is use for a permitted purpose +regardless of the source of funding or obligations resulting +from the funding. - 0. Definitions. +## Fair Use - "This License" refers to version 3 of the GNU General Public License. +You may have "fair use" rights for the software under the +law. These terms do not limit them. - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. +## No Other Rights - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. +These terms do not allow you to sublicense or transfer any of +your licenses to anyone else, or prevent the licensor from +granting licenses to anyone else. These terms do not imply +any other licenses. - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. +## Patent Defense - A "covered work" means either the unmodified Program or a work based -on the Program. +If you make any written claim that the software infringes or +contributes to infringement of any patent, your patent license +for the software granted under these terms ends immediately. If +your company makes such a claim, your patent license ends +immediately for work on behalf of your company. - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. +## Violations - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. +The first time you are notified in writing that you have +violated any of these terms, or done anything with the software +not covered by your licenses, your licenses can nonetheless +continue if you come into full compliance with these terms, +and take practical steps to correct past violations, within +32 days of receiving notice. Otherwise, all your licenses +end immediately. - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. +## No Liability - 1. Source Code. +***As far as the law allows, the software comes as is, without +any warranty or condition, and the licensor will not be liable +to you for any damages arising out of these terms or the use +or nature of the software, under any kind of legal claim.*** - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. +## Definitions - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. +The **licensor** is the individual or entity offering these +terms, and the **software** is the software the licensor makes +available under these terms. - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. +**You** refers to the individual or entity agreeing to these +terms. - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. +**Your company** is any legal entity, sole proprietorship, +or other kind of organization that you work for, plus all +organizations that have control over, are under the control of, +or are under common control with that organization. **Control** +means ownership of substantially all the assets of an entity, +or the power to direct its management and policies by vote, +contract, or otherwise. Control can be direct or indirect. - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. +**Your licenses** are all the licenses granted to you for the +software under these terms. - The Corresponding Source for a work in source code form is that -same work. +**Use** means anything you do with the software requiring one +of your licenses. - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/data/resources/thirdparty.html b/data/resources/thirdparty.html index a4d7288c4..3406a6e35 100644 --- a/data/resources/thirdparty.html +++ b/data/resources/thirdparty.html @@ -5,18 +5,9 @@ DuckStation PS1 Emulator Copyright (C) 2019-2024 Connor McLaughlin <stenzek@gmail.com> -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +This program is licensed under the terms of the PolyForm Strict License 1.0.0. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses> +You can view this license by opening the LICENSE.txt file included with the program. DuckStation contains code written by, and copyrighted by third parties.
diff --git a/src/common-tests/bitutils_tests.cpp b/src/common-tests/bitutils_tests.cpp index 6fee8e2fc..0ee7e3af2 100644 --- a/src/common-tests/bitutils_tests.cpp +++ b/src/common-tests/bitutils_tests.cpp @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/bitutils.h" + #include "gtest/gtest.h" + #include template diff --git a/src/common-tests/file_system_tests.cpp b/src/common-tests/file_system_tests.cpp index be65b2466..af3781f82 100644 --- a/src/common-tests/file_system_tests.cpp +++ b/src/common-tests/file_system_tests.cpp @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/file_system.h" + #include #ifdef _WIN32 diff --git a/src/common-tests/gsvector_yuvtorgb_test.cpp b/src/common-tests/gsvector_yuvtorgb_test.cpp index 3e6bc821f..451be2029 100644 --- a/src/common-tests/gsvector_yuvtorgb_test.cpp +++ b/src/common-tests/gsvector_yuvtorgb_test.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/bitutils.h" #include "common/gsvector.h" diff --git a/src/common-tests/path_tests.cpp b/src/common-tests/path_tests.cpp index f8db7ef97..16f22ba49 100644 --- a/src/common-tests/path_tests.cpp +++ b/src/common-tests/path_tests.cpp @@ -1,8 +1,9 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/path.h" #include "common/types.h" + #include TEST(Path, ToNativePath) diff --git a/src/common-tests/rectangle_tests.cpp b/src/common-tests/rectangle_tests.cpp index 185cd6167..29fb3ffbd 100644 --- a/src/common-tests/rectangle_tests.cpp +++ b/src/common-tests/rectangle_tests.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/gsvector.h" + #include TEST(Rectangle, AdjacentRectanglesNotIntersecting) diff --git a/src/common-tests/string_tests.cpp b/src/common-tests/string_tests.cpp index 518d21c33..6b86035e8 100644 --- a/src/common-tests/string_tests.cpp +++ b/src/common-tests/string_tests.cpp @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/string_util.h" + #include TEST(StringUtil, Ellipsise) diff --git a/src/common/align.h b/src/common/align.h index 9585f07d9..4b2269243 100644 --- a/src/common/align.h +++ b/src/common/align.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/assert.cpp b/src/common/assert.cpp index d69653ddf..534abb6b3 100644 --- a/src/common/assert.cpp +++ b/src/common/assert.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "assert.h" #include "crash_handler.h" diff --git a/src/common/assert.h b/src/common/assert.h index 3455dfc78..25c4ea8e8 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/binary_reader_writer.cpp b/src/common/binary_reader_writer.cpp index 9c357876e..a887878bd 100644 --- a/src/common/binary_reader_writer.cpp +++ b/src/common/binary_reader_writer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "binary_reader_writer.h" #include "assert.h" diff --git a/src/common/binary_reader_writer.h b/src/common/binary_reader_writer.h index a8ff2c153..3eec3b903 100644 --- a/src/common/binary_reader_writer.h +++ b/src/common/binary_reader_writer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "types.h" diff --git a/src/common/bitfield.h b/src/common/bitfield.h index 972f10c57..4e94a1641 100644 --- a/src/common/bitfield.h +++ b/src/common/bitfield.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/common/bitutils.h b/src/common/bitutils.h index dd253412f..3afaf2575 100644 --- a/src/common/bitutils.h +++ b/src/common/bitutils.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/cocoa_tools.h b/src/common/cocoa_tools.h index d2b91504a..61d7be7a9 100644 --- a/src/common/cocoa_tools.h +++ b/src/common/cocoa_tools.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include #include diff --git a/src/common/cocoa_tools.mm b/src/common/cocoa_tools.mm index ab0047e71..1e21ad016 100644 --- a/src/common/cocoa_tools.mm +++ b/src/common/cocoa_tools.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cocoa_tools.h" #include "small_string.h" @@ -49,16 +49,12 @@ bool CocoaTools::MoveFile(const char *source, const char *destination, Error *er } -// From https://github.com/PCSX2/pcsx2/blob/8d27c324187140df0c5a42f3a501b5d76b1215f5/common/CocoaTools.mm - -@interface PCSX2KVOHelper : NSObject - +@interface CommonKVOHelper : NSObject - (void)addCallback:(void*)ctx run:(void(*)(void*))callback; - (void)removeCallback:(void*)ctx; - @end -@implementation PCSX2KVOHelper +@implementation CommonKVOHelper { std::vector> _callbacks; } @@ -84,14 +80,14 @@ bool CocoaTools::MoveFile(const char *source, const char *destination, Error *er @end -static PCSX2KVOHelper* s_themeChangeHandler; +static CommonKVOHelper* s_themeChangeHandler; void CocoaTools::AddThemeChangeHandler(void* ctx, void(handler)(void* ctx)) { assert([NSThread isMainThread]); if (!s_themeChangeHandler) { - s_themeChangeHandler = [[PCSX2KVOHelper alloc] init]; + s_themeChangeHandler = [[CommonKVOHelper alloc] init]; NSApplication* app = [NSApplication sharedApplication]; [app addObserver:s_themeChangeHandler forKeyPath:@"effectiveAppearance" diff --git a/src/common/crash_handler.cpp b/src/common/crash_handler.cpp index 1dbc98056..277b0d66e 100644 --- a/src/common/crash_handler.cpp +++ b/src/common/crash_handler.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "crash_handler.h" #include "dynamic_library.h" diff --git a/src/common/crash_handler.h b/src/common/crash_handler.h index 3b632d69b..a482e90a6 100644 --- a/src/common/crash_handler.h +++ b/src/common/crash_handler.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/dynamic_library.cpp b/src/common/dynamic_library.cpp index bc27b64f7..ab2149741 100644 --- a/src/common/dynamic_library.cpp +++ b/src/common/dynamic_library.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/dynamic_library.h" #include "common/assert.h" diff --git a/src/common/dynamic_library.h b/src/common/dynamic_library.h index fbe434be5..a7564be6b 100644 --- a/src/common/dynamic_library.h +++ b/src/common/dynamic_library.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/easing.h b/src/common/easing.h index 4c4c2bee3..46ee9e62c 100644 --- a/src/common/easing.h +++ b/src/common/easing.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/common/error.cpp b/src/common/error.cpp index 4ab1fe343..a85161762 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "error.h" #include "string_util.h" diff --git a/src/common/error.h b/src/common/error.h index 23c23511b..080cb0407 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/fastjmp.cpp b/src/common/fastjmp.cpp index 893039f02..95db4455b 100644 --- a/src/common/fastjmp.cpp +++ b/src/common/fastjmp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Win32 uses Fastjmp.asm, because MSVC doesn't support inline asm. #if !defined(_WIN32) || defined(_M_ARM64) diff --git a/src/common/fastjmp.h b/src/common/fastjmp.h index 91a603b2e..40fb9cfcf 100644 --- a/src/common/fastjmp.h +++ b/src/common/fastjmp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/fastjmp_arm.asm b/src/common/fastjmp_arm.asm index ee664611f..f60975735 100644 --- a/src/common/fastjmp_arm.asm +++ b/src/common/fastjmp_arm.asm @@ -1,5 +1,5 @@ -; SPDX-FileCopyrightText: 2021 Connor McLaughlin -; SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +; SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +; SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "ksarm64.h" diff --git a/src/common/fastjmp_x86.asm b/src/common/fastjmp_x86.asm index cf681d486..1639e8ce2 100644 --- a/src/common/fastjmp_x86.asm +++ b/src/common/fastjmp_x86.asm @@ -1,5 +1,5 @@ -; SPDX-FileCopyrightText: 2021 Connor McLaughlin -; SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +; SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +; SPDX-License-Identifier: PolyForm-Strict-1.0.0 IFDEF _M_X86_32 diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 18d74c9c7..0648ab988 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "assert.h" diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp index 5212287e7..5f1f67788 100644 --- a/src/common/file_system.cpp +++ b/src/common/file_system.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "file_system.h" #include "assert.h" diff --git a/src/common/file_system.h b/src/common/file_system.h index 86380bebc..32c042e3e 100644 --- a/src/common/file_system.h +++ b/src/common/file_system.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/gsvector.cpp b/src/common/gsvector.cpp index e1660b510..df7addef8 100644 --- a/src/common/gsvector.cpp +++ b/src/common/gsvector.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gsvector.h" diff --git a/src/common/gsvector.h b/src/common/gsvector.h index 0054699a0..e99b90d2e 100644 --- a/src/common/gsvector.h +++ b/src/common/gsvector.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // // Lightweight wrapper over native SIMD types for cross-platform vector code. diff --git a/src/common/gsvector_formatter.h b/src/common/gsvector_formatter.h index 5ed7c1665..1b24d6b26 100644 --- a/src/common/gsvector_formatter.h +++ b/src/common/gsvector_formatter.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h index 2915e64c8..849992777 100644 --- a/src/common/gsvector_neon.h +++ b/src/common/gsvector_neon.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2021-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/intrin.h" #include "common/types.h" diff --git a/src/common/gsvector_nosimd.h b/src/common/gsvector_nosimd.h index c636f486f..f573552ad 100644 --- a/src/common/gsvector_nosimd.h +++ b/src/common/gsvector_nosimd.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: LGPL-3.0+ +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Implementation of GSVector4/GSVector4i when the host does not support any form of SIMD. diff --git a/src/common/gsvector_sse.h b/src/common/gsvector_sse.h index d5dfe5ada..a2e6be66f 100644 --- a/src/common/gsvector_sse.h +++ b/src/common/gsvector_sse.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team, 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: LGPL-3.0+ +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // // Lightweight wrapper over native SIMD types for cross-platform vector code. // Rewritten and NEON+No-SIMD variants added for DuckStation. diff --git a/src/common/hash_combine.h b/src/common/hash_combine.h index 52188ba88..8b8ceaab3 100644 --- a/src/common/hash_combine.h +++ b/src/common/hash_combine.h @@ -1,7 +1,11 @@ -// https://stackoverflow.com/questions/2590677/how-do-i-combine-hash-values-in-c0x +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 + #pragma once + #include +// https://stackoverflow.com/questions/2590677/how-do-i-combine-hash-values-in-c0x template void hash_combine(std::size_t& seed, const T& v, const Rest&... rest) { diff --git a/src/common/heap_array.h b/src/common/heap_array.h index 1be663d3a..14a7b8254 100644 --- a/src/common/heap_array.h +++ b/src/common/heap_array.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/heterogeneous_containers.h b/src/common/heterogeneous_containers.h index 944907b4e..6b96e2627 100644 --- a/src/common/heterogeneous_containers.h +++ b/src/common/heterogeneous_containers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 /** * Provides a map template which doesn't require heap allocations for lookups. diff --git a/src/common/intrin.h b/src/common/intrin.h index 225cd4d97..8710f1401 100644 --- a/src/common/intrin.h +++ b/src/common/intrin.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Includes appropriate intrinsic header based on platform. diff --git a/src/common/layered_settings_interface.cpp b/src/common/layered_settings_interface.cpp index 53ea6c6a7..46f829191 100644 --- a/src/common/layered_settings_interface.cpp +++ b/src/common/layered_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "layered_settings_interface.h" #include "common/assert.h" diff --git a/src/common/layered_settings_interface.h b/src/common/layered_settings_interface.h index 3d25f104a..11051f947 100644 --- a/src/common/layered_settings_interface.h +++ b/src/common/layered_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "settings_interface.h" diff --git a/src/common/log.cpp b/src/common/log.cpp index 0bde241bd..993b2bb5e 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "log.h" #include "assert.h" diff --git a/src/common/log.h b/src/common/log.h index 128d6badf..737a7eb79 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/lru_cache.h b/src/common/lru_cache.h index 0e9d96fa3..991f7d640 100644 --- a/src/common/lru_cache.h +++ b/src/common/lru_cache.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "heterogeneous_containers.h" diff --git a/src/common/md5_digest.cpp b/src/common/md5_digest.cpp index f45343c27..f9788663a 100644 --- a/src/common/md5_digest.cpp +++ b/src/common/md5_digest.cpp @@ -1,26 +1,11 @@ +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 + #include "md5_digest.h" -// based heavily on this implementation: +// based heavily on this public-domain implementation: // http://www.fourmilab.ch/md5/ -#ifndef HIGHFIRST -#define byteReverse(buf, len) /* Nothing */ -#else -/* - * Note: this code is harmless on little-endian machines. - */ -static void byteReverse(unsigned char* buf, unsigned longs) -{ - u32 t; - do - { - t = (u32)((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); - *(u32*)buf = t; - buf += 4; - } while (--longs); -} -#endif - /* The four core functions - F1 is optimized somewhat */ /* #define F1(x, y, z) (x & y | ~x & z) */ @@ -174,7 +159,6 @@ void MD5Digest::Update(const void* pData, u32 cbData) return; } std::memcpy(p, pByteData, t); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); pByteData += t; cbData -= t; @@ -184,7 +168,6 @@ void MD5Digest::Update(const void* pData, u32 cbData) while (cbData >= 64) { std::memcpy(this->in, pByteData, 64); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); pByteData += 64; cbData -= 64; @@ -222,7 +205,6 @@ void MD5Digest::Final(std::span digest) { /* Two lots of padding: Pad the first block to 64 bytes */ std::memset(p, 0, count); - byteReverse(this->in, 16); MD5Transform(this->buf, (u32*)this->in); /* Now fill the next block with 56 bytes */ @@ -233,13 +215,11 @@ void MD5Digest::Final(std::span digest) /* Pad block to 56 bytes */ std::memset(p, 0, count - 8); } - byteReverse(this->in, 14); /* Append length in bits and transform */ ((u32*)this->in)[14] = this->bits[0]; ((u32*)this->in)[15] = this->bits[1]; MD5Transform(this->buf, (u32*)this->in); - byteReverse((unsigned char*)this->buf, 4); std::memcpy(digest.data(), this->buf, 16); } diff --git a/src/common/md5_digest.h b/src/common/md5_digest.h index bf03a6e10..bd7dc3364 100644 --- a/src/common/md5_digest.h +++ b/src/common/md5_digest.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "types.h" #include diff --git a/src/common/memmap.cpp b/src/common/memmap.cpp index 10d38c068..b61d68994 100644 --- a/src/common/memmap.cpp +++ b/src/common/memmap.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memmap.h" #include "align.h" diff --git a/src/common/memmap.h b/src/common/memmap.h index f7ca87797..e3088be9c 100644 --- a/src/common/memmap.h +++ b/src/common/memmap.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/memory_settings_interface.cpp b/src/common/memory_settings_interface.cpp index 732ec20c2..2696a86f3 100644 --- a/src/common/memory_settings_interface.cpp +++ b/src/common/memory_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memory_settings_interface.h" diff --git a/src/common/memory_settings_interface.h b/src/common/memory_settings_interface.h index b1ca083b4..10b7d2e06 100644 --- a/src/common/memory_settings_interface.h +++ b/src/common/memory_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "heterogeneous_containers.h" diff --git a/src/common/minizip_helpers.h b/src/common/minizip_helpers.h index 926e598c4..5d060e573 100644 --- a/src/common/minizip_helpers.h +++ b/src/common/minizip_helpers.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/path.h b/src/common/path.h index cd78aeab8..9967cddad 100644 --- a/src/common/path.h +++ b/src/common/path.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/perf_scope.cpp b/src/common/perf_scope.cpp index ad679dabd..37a558c40 100644 --- a/src/common/perf_scope.cpp +++ b/src/common/perf_scope.cpp @@ -1,6 +1,5 @@ - -// SPDX-FileCopyrightText: 2023 Connor McLaughlin , PCSX2 Team -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "perf_scope.h" #include "assert.h" diff --git a/src/common/perf_scope.h b/src/common/perf_scope.h index 803b62297..a866fa590 100644 --- a/src/common/perf_scope.h +++ b/src/common/perf_scope.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin , PCSX2 Team -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/progress_callback.cpp b/src/common/progress_callback.cpp index eeeb94add..96ddc9049 100644 --- a/src/common/progress_callback.cpp +++ b/src/common/progress_callback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "progress_callback.h" #include "assert.h" diff --git a/src/common/progress_callback.h b/src/common/progress_callback.h index 106bd9574..b9b19c94d 100644 --- a/src/common/progress_callback.h +++ b/src/common/progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/scoped_guard.h b/src/common/scoped_guard.h index dc2f813a2..f9549aed1 100644 --- a/src/common/scoped_guard.h +++ b/src/common/scoped_guard.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/common/settings_interface.h b/src/common/settings_interface.h index baa17914e..e07fe06c1 100644 --- a/src/common/settings_interface.h +++ b/src/common/settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/sha1_digest.cpp b/src/common/sha1_digest.cpp index e4b2d8f17..97add15ec 100644 --- a/src/common/sha1_digest.cpp +++ b/src/common/sha1_digest.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "sha1_digest.h" #include "assert.h" diff --git a/src/common/sha1_digest.h b/src/common/sha1_digest.h index 1393b5510..e63e2346e 100644 --- a/src/common/sha1_digest.h +++ b/src/common/sha1_digest.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/common/small_string.cpp b/src/common/small_string.cpp index 05458fb68..4d4dcc312 100644 --- a/src/common/small_string.cpp +++ b/src/common/small_string.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "small_string.h" #include "assert.h" diff --git a/src/common/small_string.h b/src/common/small_string.h index cbac9b2af..ad2660008 100644 --- a/src/common/small_string.h +++ b/src/common/small_string.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "types.h" #include "fmt/core.h" diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 9f307b5ae..4b0d2582f 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "string_util.h" #include "assert.h" diff --git a/src/common/string_util.h b/src/common/string_util.h index 6656ed9ed..c261a7d13 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "types.h" #include #include diff --git a/src/common/threading.cpp b/src/common/threading.cpp index 8dacce838..d72932c4f 100644 --- a/src/common/threading.cpp +++ b/src/common/threading.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "threading.h" #include "assert.h" diff --git a/src/common/threading.h b/src/common/threading.h index 49686bc36..a57c7f160 100644 --- a/src/common/threading.h +++ b/src/common/threading.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/common/timer.cpp b/src/common/timer.cpp index c3aaf6009..d4a290148 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "timer.h" #include "types.h" diff --git a/src/common/timer.h b/src/common/timer.h index 4206cad9a..d4cde6c10 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include diff --git a/src/common/types.h b/src/common/types.h index 2bc435636..4a63ddab1 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include #include #include diff --git a/src/common/windows_headers.h b/src/common/windows_headers.h index ba4d60f3d..ee647d1d0 100644 --- a/src/common/windows_headers.h +++ b/src/common/windows_headers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index e77341c33..fc4b08443 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // TODO: Don't poll when booting the game, e.g. Crash Warped freaks out. diff --git a/src/core/achievements.h b/src/core/achievements.h index 0618a4ac1..fd0b28870 100644 --- a/src/core/achievements.h +++ b/src/core/achievements.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/achievements_private.h b/src/core/achievements_private.h index f3db1df11..c489275fd 100644 --- a/src/core/achievements_private.h +++ b/src/core/achievements_private.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp index 38133bb9f..d448a1ac7 100644 --- a/src/core/analog_controller.cpp +++ b/src/core/analog_controller.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "analog_controller.h" #include "host.h" diff --git a/src/core/analog_controller.h b/src/core/analog_controller.h index e978f35e3..179869d8a 100644 --- a/src/core/analog_controller.h +++ b/src/core/analog_controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/analog_joystick.cpp b/src/core/analog_joystick.cpp index 4aa4804fc..712f78dff 100644 --- a/src/core/analog_joystick.cpp +++ b/src/core/analog_joystick.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "analog_joystick.h" #include "host.h" diff --git a/src/core/analog_joystick.h b/src/core/analog_joystick.h index 456aa3c9d..3ab28f510 100644 --- a/src/core/analog_joystick.h +++ b/src/core/analog_joystick.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/bios.cpp b/src/core/bios.cpp index 1c9d022c5..638cdf1d0 100644 --- a/src/core/bios.cpp +++ b/src/core/bios.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "bios.h" #include "cpu_disasm.h" diff --git a/src/core/bios.h b/src/core/bios.h index 3188212b9..df7a19e07 100644 --- a/src/core/bios.h +++ b/src/core/bios.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 91246ae28..fa147f58f 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "bus.h" #include "bios.h" diff --git a/src/core/bus.h b/src/core/bus.h index ce1088c66..44b34eab7 100644 --- a/src/core/bus.h +++ b/src/core/bus.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 42b1f2220..63fcd98e6 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cdrom.h" #include "cdrom_async_reader.h" diff --git a/src/core/cdrom.h b/src/core/cdrom.h index 15c942e35..c6f332142 100644 --- a/src/core/cdrom.h +++ b/src/core/cdrom.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/core/cdrom_async_reader.cpp b/src/core/cdrom_async_reader.cpp index f9d15247b..fa6b5b1bf 100644 --- a/src/core/cdrom_async_reader.cpp +++ b/src/core/cdrom_async_reader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cdrom_async_reader.h" #include "common/assert.h" diff --git a/src/core/cdrom_async_reader.h b/src/core/cdrom_async_reader.h index 262cbdfa2..d5516f87b 100644 --- a/src/core/cdrom_async_reader.h +++ b/src/core/cdrom_async_reader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "util/cd_image.h" diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index 94dfce97c..6616755f0 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cheats.h" #include "bus.h" diff --git a/src/core/cheats.h b/src/core/cheats.h index c56990402..ef8fec37e 100644 --- a/src/core/cheats.h +++ b/src/core/cheats.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/controller.cpp b/src/core/controller.cpp index ee266f621..e5f4748d2 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "controller.h" #include "analog_controller.h" diff --git a/src/core/controller.h b/src/core/controller.h index 003695c00..17acda06d 100644 --- a/src/core/controller.h +++ b/src/core/controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp index c32d19209..3a3aa8ee4 100644 --- a/src/core/cpu_code_cache.cpp +++ b/src/core/cpu_code_cache.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "bus.h" #include "cpu_code_cache_private.h" diff --git a/src/core/cpu_code_cache.h b/src/core/cpu_code_cache.h index 171e269df..a04568dcd 100644 --- a/src/core/cpu_code_cache.h +++ b/src/core/cpu_code_cache.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cpu_code_cache_private.h b/src/core/cpu_code_cache_private.h index be1c05108..6ce03b2a5 100644 --- a/src/core/cpu_code_cache_private.h +++ b/src/core/cpu_code_cache_private.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cpu_core.cpp b/src/core/cpu_core.cpp index b57f7b7e5..d029e65b3 100644 --- a/src/core/cpu_core.cpp +++ b/src/core/cpu_core.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_core.h" #include "bus.h" diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h index dc877fb09..ab1c367ba 100644 --- a/src/core/cpu_core.h +++ b/src/core/cpu_core.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cpu_core_private.h b/src/core/cpu_core_private.h index 1cfe91697..146e7dbed 100644 --- a/src/core/cpu_core_private.h +++ b/src/core/cpu_core_private.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "bus.h" diff --git a/src/core/cpu_disasm.cpp b/src/core/cpu_disasm.cpp index 90e14240f..22c8a6e05 100644 --- a/src/core/cpu_disasm.cpp +++ b/src/core/cpu_disasm.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_disasm.h" #include "cpu_core.h" diff --git a/src/core/cpu_disasm.h b/src/core/cpu_disasm.h index 460b1b97d..15a96a4b0 100644 --- a/src/core/cpu_disasm.h +++ b/src/core/cpu_disasm.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "cpu_types.h" diff --git a/src/core/cpu_newrec_compiler.cpp b/src/core/cpu_newrec_compiler.cpp index 35cb6f25c..067f337d6 100644 --- a/src/core/cpu_newrec_compiler.cpp +++ b/src/core/cpu_newrec_compiler.cpp @@ -1,17 +1,20 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_newrec_compiler.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/small_string.h" #include "cpu_code_cache.h" #include "cpu_core_private.h" #include "cpu_disasm.h" #include "cpu_pgxp.h" #include "settings.h" + +#include "common/assert.h" +#include "common/log.h" +#include "common/small_string.h" + #include #include + Log_SetChannel(NewRec::Compiler); // TODO: direct link skip delay slot check diff --git a/src/core/cpu_newrec_compiler.h b/src/core/cpu_newrec_compiler.h index d1e184040..c33667579 100644 --- a/src/core/cpu_newrec_compiler.h +++ b/src/core/cpu_newrec_compiler.h @@ -1,10 +1,12 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "cpu_code_cache_private.h" #include "cpu_recompiler_types.h" #include "cpu_types.h" + #include #include #include diff --git a/src/core/cpu_newrec_compiler_aarch32.cpp b/src/core/cpu_newrec_compiler_aarch32.cpp index 0d0347049..6a1c76bff 100644 --- a/src/core/cpu_newrec_compiler_aarch32.cpp +++ b/src/core/cpu_newrec_compiler_aarch32.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_newrec_compiler_aarch32.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" #include "cpu_recompiler_thunks.h" @@ -13,6 +9,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_ARM32 diff --git a/src/core/cpu_newrec_compiler_aarch32.h b/src/core/cpu_newrec_compiler_aarch32.h index 604330d82..75b971a1e 100644 --- a/src/core/cpu_newrec_compiler_aarch32.h +++ b/src/core/cpu_newrec_compiler_aarch32.h @@ -1,9 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_ARM32 diff --git a/src/core/cpu_newrec_compiler_aarch64.cpp b/src/core/cpu_newrec_compiler_aarch64.cpp index 45d4c8674..25de2c658 100644 --- a/src/core/cpu_newrec_compiler_aarch64.cpp +++ b/src/core/cpu_newrec_compiler_aarch64.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_newrec_compiler_aarch64.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" #include "cpu_recompiler_thunks.h" @@ -13,6 +9,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_ARM64 diff --git a/src/core/cpu_newrec_compiler_aarch64.h b/src/core/cpu_newrec_compiler_aarch64.h index e30c26986..7924842ba 100644 --- a/src/core/cpu_newrec_compiler_aarch64.h +++ b/src/core/cpu_newrec_compiler_aarch64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_ARM64 diff --git a/src/core/cpu_newrec_compiler_riscv64.cpp b/src/core/cpu_newrec_compiler_riscv64.cpp index 61a6557ac..a7990317b 100644 --- a/src/core/cpu_newrec_compiler_riscv64.cpp +++ b/src/core/cpu_newrec_compiler_riscv64.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_newrec_compiler_riscv64.h" #include "cpu_code_cache_private.h" diff --git a/src/core/cpu_newrec_compiler_riscv64.h b/src/core/cpu_newrec_compiler_riscv64.h index 55ec6d142..1e222cce8 100644 --- a/src/core/cpu_newrec_compiler_riscv64.h +++ b/src/core/cpu_newrec_compiler_riscv64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_RISCV64 diff --git a/src/core/cpu_newrec_compiler_x64.cpp b/src/core/cpu_newrec_compiler_x64.cpp index 2bb4f6776..b502bc0f5 100644 --- a/src/core/cpu_newrec_compiler_x64.cpp +++ b/src/core/cpu_newrec_compiler_x64.cpp @@ -1,11 +1,7 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_newrec_compiler_x64.h" -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/string_util.h" #include "cpu_code_cache_private.h" #include "cpu_core_private.h" #include "cpu_pgxp.h" @@ -14,6 +10,12 @@ #include "gte.h" #include "settings.h" #include "timing_event.h" + +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/string_util.h" + #include #ifdef CPU_ARCH_X64 diff --git a/src/core/cpu_newrec_compiler_x64.h b/src/core/cpu_newrec_compiler_x64.h index 10205406d..d88c09cc0 100644 --- a/src/core/cpu_newrec_compiler_x64.h +++ b/src/core/cpu_newrec_compiler_x64.h @@ -1,8 +1,10 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "cpu_newrec_compiler.h" + #include #ifdef CPU_ARCH_X64 diff --git a/src/core/cpu_pgxp.cpp b/src/core/cpu_pgxp.cpp index 136eb14fb..edc80b3b0 100644 --- a/src/core/cpu_pgxp.cpp +++ b/src/core/cpu_pgxp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // // This file has been completely rewritten over the years compared to the original PCSXR-PGXP release. // No original code remains. The original copyright notice is included above for historical purposes. diff --git a/src/core/cpu_pgxp.h b/src/core/cpu_pgxp.h index 108a312d1..05b04a15a 100644 --- a/src/core/cpu_pgxp.h +++ b/src/core/cpu_pgxp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-FileCopyrightText: 2016 iCatButler, 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "cpu_core.h" diff --git a/src/core/cpu_recompiler_code_generator.cpp b/src/core/cpu_recompiler_code_generator.cpp index fc05b7a0d..19bb6a9ae 100644 --- a/src/core/cpu_recompiler_code_generator.cpp +++ b/src/core/cpu_recompiler_code_generator.cpp @@ -1,14 +1,16 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_recompiler_code_generator.h" -#include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" #include "cpu_disasm.h" #include "cpu_pgxp.h" #include "gte.h" #include "settings.h" + +#include "common/log.h" + Log_SetChannel(CPU::Recompiler); // TODO: Turn load+sext/zext into a single signed/unsigned load diff --git a/src/core/cpu_recompiler_code_generator.h b/src/core/cpu_recompiler_code_generator.h index c6b53eb1c..760c0eab6 100644 --- a/src/core/cpu_recompiler_code_generator.h +++ b/src/core/cpu_recompiler_code_generator.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/cpu_recompiler_code_generator_aarch32.cpp b/src/core/cpu_recompiler_code_generator_aarch32.cpp index c9a53236c..fedc2fa1f 100644 --- a/src/core/cpu_recompiler_code_generator_aarch32.cpp +++ b/src/core/cpu_recompiler_code_generator_aarch32.cpp @@ -1,10 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) - -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/memmap.h" +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" @@ -14,6 +9,11 @@ #include "settings.h" #include "timing_event.h" +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/memmap.h" + #ifdef CPU_ARCH_ARM32 Log_SetChannel(CPU::Recompiler); diff --git a/src/core/cpu_recompiler_code_generator_aarch64.cpp b/src/core/cpu_recompiler_code_generator_aarch64.cpp index 57b67d446..409569a29 100644 --- a/src/core/cpu_recompiler_code_generator_aarch64.cpp +++ b/src/core/cpu_recompiler_code_generator_aarch64.cpp @@ -1,10 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) - -#include "common/align.h" -#include "common/assert.h" -#include "common/log.h" -#include "common/memmap.h" +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" @@ -14,6 +9,11 @@ #include "settings.h" #include "timing_event.h" +#include "common/align.h" +#include "common/assert.h" +#include "common/log.h" +#include "common/memmap.h" + #ifdef CPU_ARCH_ARM64 Log_SetChannel(CPU::Recompiler); diff --git a/src/core/cpu_recompiler_code_generator_generic.cpp b/src/core/cpu_recompiler_code_generator_generic.cpp index 0b3f262c9..7e75380ec 100644 --- a/src/core/cpu_recompiler_code_generator_generic.cpp +++ b/src/core/cpu_recompiler_code_generator_generic.cpp @@ -1,11 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 -#include "common/log.h" #include "cpu_core.h" #include "cpu_core_private.h" #include "cpu_recompiler_code_generator.h" #include "settings.h" + +#include "common/log.h" + Log_SetChannel(Recompiler::CodeGenerator); namespace CPU::Recompiler { diff --git a/src/core/cpu_recompiler_code_generator_x64.cpp b/src/core/cpu_recompiler_code_generator_x64.cpp index 88eceac46..db76f9fa1 100644 --- a/src/core/cpu_recompiler_code_generator_x64.cpp +++ b/src/core/cpu_recompiler_code_generator_x64.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_code_cache_private.h" #include "cpu_core.h" diff --git a/src/core/cpu_recompiler_register_cache.cpp b/src/core/cpu_recompiler_register_cache.cpp index 5b1737cf7..941a8e974 100644 --- a/src/core/cpu_recompiler_register_cache.cpp +++ b/src/core/cpu_recompiler_register_cache.cpp @@ -1,10 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_recompiler_register_cache.h" -#include "common/log.h" #include "cpu_recompiler_code_generator.h" + +#include "common/log.h" + #include + Log_SetChannel(CPU::Recompiler); namespace CPU::Recompiler { diff --git a/src/core/cpu_recompiler_register_cache.h b/src/core/cpu_recompiler_register_cache.h index 305e93292..0b8a56de0 100644 --- a/src/core/cpu_recompiler_register_cache.h +++ b/src/core/cpu_recompiler_register_cache.h @@ -1,11 +1,13 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once -#include "common/assert.h" + #include "cpu_recompiler_types.h" #include "cpu_types.h" +#include "common/assert.h" + #if defined(CPU_ARCH_ARM32) #include "vixl/aarch32/macro-assembler-aarch32.h" #elif defined(CPU_ARCH_ARM64) diff --git a/src/core/cpu_recompiler_thunks.h b/src/core/cpu_recompiler_thunks.h index e72b2b680..89ded45b3 100644 --- a/src/core/cpu_recompiler_thunks.h +++ b/src/core/cpu_recompiler_thunks.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "cpu_code_cache.h" #include "cpu_types.h" diff --git a/src/core/cpu_recompiler_types.h b/src/core/cpu_recompiler_types.h index 4a0e3e330..f3d3eefbd 100644 --- a/src/core/cpu_recompiler_types.h +++ b/src/core/cpu_recompiler_types.h @@ -1,9 +1,10 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Shared code between recompiler backends. #pragma once + #include "cpu_types.h" #include diff --git a/src/core/cpu_types.cpp b/src/core/cpu_types.cpp index 9b4312d5a..04c61b709 100644 --- a/src/core/cpu_types.cpp +++ b/src/core/cpu_types.cpp @@ -1,8 +1,10 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cpu_types.h" + #include "common/assert.h" + #include static const std::array s_reg_names = { diff --git a/src/core/cpu_types.h b/src/core/cpu_types.h index 5defc4900..20b01fc0e 100644 --- a/src/core/cpu_types.h +++ b/src/core/cpu_types.h @@ -1,10 +1,13 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + +#include "types.h" + #include "common/bitfield.h" #include "common/bitutils.h" -#include "types.h" + #include namespace CPU { diff --git a/src/core/digital_controller.cpp b/src/core/digital_controller.cpp index 6445d0759..7d5d61456 100644 --- a/src/core/digital_controller.cpp +++ b/src/core/digital_controller.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "digital_controller.h" #include "host.h" diff --git a/src/core/digital_controller.h b/src/core/digital_controller.h index c4c689b59..1d8fcd046 100644 --- a/src/core/digital_controller.h +++ b/src/core/digital_controller.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/dma.cpp b/src/core/dma.cpp index 589d0a0f2..a38393353 100644 --- a/src/core/dma.cpp +++ b/src/core/dma.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "dma.h" #include "bus.h" diff --git a/src/core/dma.h b/src/core/dma.h index 3c7c99fb7..7d773a17e 100644 --- a/src/core/dma.h +++ b/src/core/dma.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "types.h" class StateWrapper; diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 3b0f0be2f..6efe3ca6b 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "fullscreen_ui.h" #include "achievements.h" diff --git a/src/core/fullscreen_ui.h b/src/core/fullscreen_ui.h index ee447c269..702338db7 100644 --- a/src/core/fullscreen_ui.h +++ b/src/core/fullscreen_ui.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/game_database.cpp b/src/core/game_database.cpp index 5c1698fe8..e4f58d81a 100644 --- a/src/core/game_database.cpp +++ b/src/core/game_database.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "game_database.h" #include "controller.h" diff --git a/src/core/game_database.h b/src/core/game_database.h index 768817351..1f743c54c 100644 --- a/src/core/game_database.h +++ b/src/core/game_database.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "core/types.h" diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index 3b8c7c5ee..eabccd2ca 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "game_list.h" #include "bios.h" diff --git a/src/core/game_list.h b/src/core/game_list.h index 723f4885d..d5f7f21b4 100644 --- a/src/core/game_list.h +++ b/src/core/game_list.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gdb_server.cpp b/src/core/gdb_server.cpp index 59282107d..7453cc47b 100644 --- a/src/core/gdb_server.cpp +++ b/src/core/gdb_server.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gdb_server.h" #include "bus.h" diff --git a/src/core/gdb_server.h b/src/core/gdb_server.h index 6e80d4612..632dbf5f8 100644 --- a/src/core/gdb_server.h +++ b/src/core/gdb_server.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp index 0c7ae279a..3d9c746f6 100644 --- a/src/core/gpu.cpp +++ b/src/core/gpu.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu.h" #include "dma.h" diff --git a/src/core/gpu.h b/src/core/gpu.h index 76cb8768a..58076cfb8 100644 --- a/src/core/gpu.h +++ b/src/core/gpu.h @@ -1,7 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "gpu_types.h" #include "timers.h" #include "timing_event.h" diff --git a/src/core/gpu_backend.cpp b/src/core/gpu_backend.cpp index 57508ff78..77aaa1a50 100644 --- a/src/core/gpu_backend.cpp +++ b/src/core/gpu_backend.cpp @@ -1,12 +1,15 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_backend.h" +#include "settings.h" + +#include "util/state_wrapper.h" + #include "common/align.h" #include "common/log.h" #include "common/timer.h" -#include "settings.h" -#include "util/state_wrapper.h" + Log_SetChannel(GPUBackend); std::unique_ptr g_gpu_backend; diff --git a/src/core/gpu_backend.h b/src/core/gpu_backend.h index b58df358c..d6bc80671 100644 --- a/src/core/gpu_backend.h +++ b/src/core/gpu_backend.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp index 3fe1c9eb0..ebb28d0f6 100644 --- a/src/core/gpu_commands.cpp +++ b/src/core/gpu_commands.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu.h" #include "interrupt_controller.h" diff --git a/src/core/gpu_hw.cpp b/src/core/gpu_hw.cpp index 84c05a926..950b54e52 100644 --- a/src/core/gpu_hw.cpp +++ b/src/core/gpu_hw.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_hw.h" #include "cpu_core.h" diff --git a/src/core/gpu_hw.h b/src/core/gpu_hw.h index 9131a5911..4db2d133d 100644 --- a/src/core/gpu_hw.h +++ b/src/core/gpu_hw.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_hw_shadergen.cpp b/src/core/gpu_hw_shadergen.cpp index 8bb639644..c423c2451 100644 --- a/src/core/gpu_hw_shadergen.cpp +++ b/src/core/gpu_hw_shadergen.cpp @@ -1,5 +1,8 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 +// +// NOTE: Some parts of this file have more permissive licenses. They are marked appropriately. +// #include "gpu_hw_shadergen.h" diff --git a/src/core/gpu_hw_shadergen.h b/src/core/gpu_hw_shadergen.h index e8ccf4947..8dca6141e 100644 --- a/src/core/gpu_hw_shadergen.h +++ b/src/core/gpu_hw_shadergen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_shadergen.cpp b/src/core/gpu_shadergen.cpp index 1be4e495a..12a4526dd 100644 --- a/src/core/gpu_shadergen.cpp +++ b/src/core/gpu_shadergen.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_shadergen.h" diff --git a/src/core/gpu_shadergen.h b/src/core/gpu_shadergen.h index 171bc0a96..3eacc3537 100644 --- a/src/core/gpu_shadergen.h +++ b/src/core/gpu_shadergen.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: GPL-3.0 +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_sw.cpp b/src/core/gpu_sw.cpp index 56a88e779..2f621e0e9 100644 --- a/src/core/gpu_sw.cpp +++ b/src/core/gpu_sw.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_sw.h" #include "system.h" diff --git a/src/core/gpu_sw.h b/src/core/gpu_sw.h index 515db17b5..93bf56ee9 100644 --- a/src/core/gpu_sw.h +++ b/src/core/gpu_sw.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_sw_backend.cpp b/src/core/gpu_sw_backend.cpp index cbf547d88..b42c61b71 100644 --- a/src/core/gpu_sw_backend.cpp +++ b/src/core/gpu_sw_backend.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_sw_backend.h" #include "gpu.h" diff --git a/src/core/gpu_sw_backend.h b/src/core/gpu_sw_backend.h index 2c0394ebc..c69310f12 100644 --- a/src/core/gpu_sw_backend.h +++ b/src/core/gpu_sw_backend.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_sw_rasterizer.cpp b/src/core/gpu_sw_rasterizer.cpp index 5344ed998..7e470eda0 100644 --- a/src/core/gpu_sw_rasterizer.cpp +++ b/src/core/gpu_sw_rasterizer.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_sw_rasterizer.h" diff --git a/src/core/gpu_sw_rasterizer.h b/src/core/gpu_sw_rasterizer.h index 89fc814d3..55408be3c 100644 --- a/src/core/gpu_sw_rasterizer.h +++ b/src/core/gpu_sw_rasterizer.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gpu_sw_rasterizer.inl b/src/core/gpu_sw_rasterizer.inl index 68fb93ad7..1ec13fa1c 100644 --- a/src/core/gpu_sw_rasterizer.inl +++ b/src/core/gpu_sw_rasterizer.inl @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin // SPDX-License-Identifier: PolyForm-Strict-1.0.0 #ifdef __INTELLISENSE__ diff --git a/src/core/gpu_sw_rasterizer_avx2.cpp b/src/core/gpu_sw_rasterizer_avx2.cpp index c145ee98c..95fa5e748 100644 --- a/src/core/gpu_sw_rasterizer_avx2.cpp +++ b/src/core/gpu_sw_rasterizer_avx2.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_sw_rasterizer.h" diff --git a/src/core/gpu_types.h b/src/core/gpu_types.h index 7faadd71e..bcf12194c 100644 --- a/src/core/gpu_types.h +++ b/src/core/gpu_types.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/gte.cpp b/src/core/gte.cpp index 6a81740fd..9bcb91aaa 100644 --- a/src/core/gte.cpp +++ b/src/core/gte.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gte.h" diff --git a/src/core/gte.h b/src/core/gte.h index c2249dd01..c620f183d 100644 --- a/src/core/gte.h +++ b/src/core/gte.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "gte_types.h" diff --git a/src/core/gte_types.h b/src/core/gte_types.h index 5abb9e216..56730a665 100644 --- a/src/core/gte_types.h +++ b/src/core/gte_types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/bitfield.h" diff --git a/src/core/guncon.cpp b/src/core/guncon.cpp index a794fd214..39bbaaff7 100644 --- a/src/core/guncon.cpp +++ b/src/core/guncon.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "guncon.h" #include "gpu.h" diff --git a/src/core/guncon.h b/src/core/guncon.h index ed8a5ebab..958b815da 100644 --- a/src/core/guncon.h +++ b/src/core/guncon.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/host.cpp b/src/core/host.cpp index 83aa56f9d..244002f49 100644 --- a/src/core/host.cpp +++ b/src/core/host.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "host.h" #include "fullscreen_ui.h" diff --git a/src/core/host.h b/src/core/host.h index a66e78727..c1af516fa 100644 --- a/src/core/host.h +++ b/src/core/host.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/host_interface_progress_callback.cpp b/src/core/host_interface_progress_callback.cpp index 0bb8098fc..8b68a1ed1 100644 --- a/src/core/host_interface_progress_callback.cpp +++ b/src/core/host_interface_progress_callback.cpp @@ -1,9 +1,11 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "host_interface_progress_callback.h" -#include "common/log.h" #include "host.h" + +#include "common/log.h" + Log_SetChannel(HostInterfaceProgressCallback); HostInterfaceProgressCallback::HostInterfaceProgressCallback() : ProgressCallback() diff --git a/src/core/host_interface_progress_callback.h b/src/core/host_interface_progress_callback.h index d8358da94..e5576df11 100644 --- a/src/core/host_interface_progress_callback.h +++ b/src/core/host_interface_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/hotkeys.cpp b/src/core/hotkeys.cpp index 405e8c00c..4c0c3cd78 100644 --- a/src/core/hotkeys.cpp +++ b/src/core/hotkeys.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "achievements.h" #include "cpu_code_cache.h" diff --git a/src/core/imgui_overlays.cpp b/src/core/imgui_overlays.cpp index a1376553f..99600e9fb 100644 --- a/src/core/imgui_overlays.cpp +++ b/src/core/imgui_overlays.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "imgui_overlays.h" #include "cdrom.h" diff --git a/src/core/imgui_overlays.h b/src/core/imgui_overlays.h index 0e8d47b4e..51dd54679 100644 --- a/src/core/imgui_overlays.h +++ b/src/core/imgui_overlays.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/input_types.h b/src/core/input_types.h index a49d79502..0a41459dc 100644 --- a/src/core/input_types.h +++ b/src/core/input_types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2022-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/core/interrupt_controller.cpp b/src/core/interrupt_controller.cpp index aabea79ec..2e8e22dd6 100644 --- a/src/core/interrupt_controller.cpp +++ b/src/core/interrupt_controller.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "interrupt_controller.h" #include "cpu_core.h" diff --git a/src/core/interrupt_controller.h b/src/core/interrupt_controller.h index 4f2dfe3cf..8672afd98 100644 --- a/src/core/interrupt_controller.h +++ b/src/core/interrupt_controller.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "types.h" diff --git a/src/core/justifier.cpp b/src/core/justifier.cpp index 0e435e31d..a885053cd 100644 --- a/src/core/justifier.cpp +++ b/src/core/justifier.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "justifier.h" #include "gpu.h" diff --git a/src/core/justifier.h b/src/core/justifier.h index 6d09f8af5..569631459 100644 --- a/src/core/justifier.h +++ b/src/core/justifier.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/mdec.cpp b/src/core/mdec.cpp index 454cc151f..a67700ef3 100644 --- a/src/core/mdec.cpp +++ b/src/core/mdec.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "mdec.h" #include "cpu_core.h" diff --git a/src/core/mdec.h b/src/core/mdec.h index ec3e79f36..7ddd4f8fa 100644 --- a/src/core/mdec.h +++ b/src/core/mdec.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "types.h" class StateWrapper; diff --git a/src/core/memory_card.cpp b/src/core/memory_card.cpp index 550793f09..9699e6b73 100644 --- a/src/core/memory_card.cpp +++ b/src/core/memory_card.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memory_card.h" #include "host.h" diff --git a/src/core/memory_card.h b/src/core/memory_card.h index 56ee7771d..178130c40 100644 --- a/src/core/memory_card.h +++ b/src/core/memory_card.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/memory_card_image.cpp b/src/core/memory_card_image.cpp index 78558161d..acc4b041f 100644 --- a/src/core/memory_card_image.cpp +++ b/src/core/memory_card_image.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memory_card_image.h" #include "gpu_types.h" diff --git a/src/core/memory_card_image.h b/src/core/memory_card_image.h index c33a8b508..adb487e3f 100644 --- a/src/core/memory_card_image.h +++ b/src/core/memory_card_image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/multitap.cpp b/src/core/multitap.cpp index 6ea5e4683..65ac8ff6c 100644 --- a/src/core/multitap.cpp +++ b/src/core/multitap.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "multitap.h" #include "controller.h" diff --git a/src/core/multitap.h b/src/core/multitap.h index 040e47f45..4d0a92e2e 100644 --- a/src/core/multitap.h +++ b/src/core/multitap.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/negcon.cpp b/src/core/negcon.cpp index 515fea317..e4148f8c7 100644 --- a/src/core/negcon.cpp +++ b/src/core/negcon.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "negcon.h" #include "host.h" diff --git a/src/core/negcon.h b/src/core/negcon.h index 0b3e195a8..87a0b87b3 100644 --- a/src/core/negcon.h +++ b/src/core/negcon.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/negcon_rumble.cpp b/src/core/negcon_rumble.cpp index a8c95e10c..4b172e49d 100644 --- a/src/core/negcon_rumble.cpp +++ b/src/core/negcon_rumble.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "negcon_rumble.h" #include "IconsFontAwesome5.h" diff --git a/src/core/negcon_rumble.h b/src/core/negcon_rumble.h index 32bfb32da..a86c19e4a 100644 --- a/src/core/negcon_rumble.h +++ b/src/core/negcon_rumble.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/pad.cpp b/src/core/pad.cpp index 763ca4dd3..d6d370e02 100644 --- a/src/core/pad.cpp +++ b/src/core/pad.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "pad.h" #include "controller.h" diff --git a/src/core/pad.h b/src/core/pad.h index 45ba93ba0..7264ef589 100644 --- a/src/core/pad.h +++ b/src/core/pad.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/pcdrv.cpp b/src/core/pcdrv.cpp index dd27a7d8e..d8549cf5c 100644 --- a/src/core/pcdrv.cpp +++ b/src/core/pcdrv.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "pcdrv.h" #include "cpu_core.h" diff --git a/src/core/pcdrv.h b/src/core/pcdrv.h index aca11424c..9a908e272 100644 --- a/src/core/pcdrv.h +++ b/src/core/pcdrv.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/pch.cpp b/src/core/pch.cpp index ef4256aee..5b7d58117 100644 --- a/src/core/pch.cpp +++ b/src/core/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "pch.h" diff --git a/src/core/pch.h b/src/core/pch.h index 325ed4db1..d7bf1910b 100644 --- a/src/core/pch.h +++ b/src/core/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/pine_server.cpp b/src/core/pine_server.cpp index 69da7b54b..9fc392a24 100644 --- a/src/core/pine_server.cpp +++ b/src/core/pine_server.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team, Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 +// // NOTE: File has been rewritten completely compared to the original, only the enums remain. +// #include "pine_server.h" #include "cpu_core.h" diff --git a/src/core/pine_server.h b/src/core/pine_server.h index f3df859fb..0f264663c 100644 --- a/src/core/pine_server.h +++ b/src/core/pine_server.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team, Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // A reference client implementation for interfacing with PINE is available here: // https://code.govanify.com/govanify/pine/ diff --git a/src/core/playstation_mouse.cpp b/src/core/playstation_mouse.cpp index efde92c7e..07ad9d6aa 100644 --- a/src/core/playstation_mouse.cpp +++ b/src/core/playstation_mouse.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "playstation_mouse.h" #include "gpu.h" diff --git a/src/core/playstation_mouse.h b/src/core/playstation_mouse.h index 2583d0c75..cf3796616 100644 --- a/src/core/playstation_mouse.h +++ b/src/core/playstation_mouse.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/psf_loader.cpp b/src/core/psf_loader.cpp index c4fc37e60..e5dec1f15 100644 --- a/src/core/psf_loader.cpp +++ b/src/core/psf_loader.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "psf_loader.h" #include "bios.h" diff --git a/src/core/psf_loader.h b/src/core/psf_loader.h index 84e272140..82269be02 100644 --- a/src/core/psf_loader.h +++ b/src/core/psf_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/save_state_version.h b/src/core/save_state_version.h index 9f3c6cc37..3ba545744 100644 --- a/src/core/save_state_version.h +++ b/src/core/save_state_version.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/settings.cpp b/src/core/settings.cpp index db23ed84e..cff0a06c4 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "settings.h" #include "achievements.h" diff --git a/src/core/settings.h b/src/core/settings.h index 3a0390642..6e2a22ef4 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/shader_cache_version.h b/src/core/shader_cache_version.h index f1c67d8da..e3b5e442e 100644 --- a/src/core/shader_cache_version.h +++ b/src/core/shader_cache_version.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/sio.cpp b/src/core/sio.cpp index 81e4ef7f7..480342236 100644 --- a/src/core/sio.cpp +++ b/src/core/sio.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "sio.h" #include "controller.h" diff --git a/src/core/sio.h b/src/core/sio.h index da35af248..3af174aaa 100644 --- a/src/core/sio.h +++ b/src/core/sio.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/spu.cpp b/src/core/spu.cpp index 394ff41c9..78cc9dd9e 100644 --- a/src/core/spu.cpp +++ b/src/core/spu.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "spu.h" #include "cdrom.h" diff --git a/src/core/spu.h b/src/core/spu.h index 46674e422..e00bb98ae 100644 --- a/src/core/spu.h +++ b/src/core/spu.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/system.cpp b/src/core/system.cpp index 525210887..d4797f0af 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "system.h" #include "achievements.h" diff --git a/src/core/system.h b/src/core/system.h index 3a776dc0c..687b29b33 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/texture_replacements.cpp b/src/core/texture_replacements.cpp index 57fa07540..fdbeb3e84 100644 --- a/src/core/texture_replacements.cpp +++ b/src/core/texture_replacements.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "texture_replacements.h" #include "gpu_types.h" diff --git a/src/core/texture_replacements.h b/src/core/texture_replacements.h index 78e7f2d83..b2ec87098 100644 --- a/src/core/texture_replacements.h +++ b/src/core/texture_replacements.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/timers.cpp b/src/core/timers.cpp index 3d85b54f5..f23e9cd18 100644 --- a/src/core/timers.cpp +++ b/src/core/timers.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "timers.h" #include "gpu.h" diff --git a/src/core/timers.h b/src/core/timers.h index 778c8e24b..37114c2de 100644 --- a/src/core/timers.h +++ b/src/core/timers.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp index caf980f1a..d3c088f00 100644 --- a/src/core/timing_event.cpp +++ b/src/core/timing_event.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "timing_event.h" #include "cpu_core.h" diff --git a/src/core/timing_event.h b/src/core/timing_event.h index f3fe7d5e6..2dea5f75b 100644 --- a/src/core/timing_event.h +++ b/src/core/timing_event.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/core/types.h b/src/core/types.h index e00902bd2..29bef0c94 100644 --- a/src/core/types.h +++ b/src/core/types.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/aboutdialog.cpp b/src/duckstation-qt/aboutdialog.cpp index 07c4620e7..cec9d46f2 100644 --- a/src/duckstation-qt/aboutdialog.cpp +++ b/src/duckstation-qt/aboutdialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "aboutdialog.h" #include "qtutils.h" @@ -40,7 +40,7 @@ p, li { white-space: pre-wrap; }

Connor McLaughlin <stenzek@gmail.com>

and other contributors

%3 icons8

-

%4 | GitHub | Discord

+

%4 | GitHub | Discord

)") .arg(tr("DuckStation is a free and open-source simulator/emulator of the Sony " "PlayStationTM console, focusing on " diff --git a/src/duckstation-qt/aboutdialog.h b/src/duckstation-qt/aboutdialog.h index e79d51220..49eaedb40 100644 --- a/src/duckstation-qt/aboutdialog.h +++ b/src/duckstation-qt/aboutdialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index f79b4234d..65d1c7fce 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "achievementlogindialog.h" #include "qthost.h" diff --git a/src/duckstation-qt/achievementlogindialog.h b/src/duckstation-qt/achievementlogindialog.h index 2e63a0abc..5317d44cc 100644 --- a/src/duckstation-qt/achievementlogindialog.h +++ b/src/duckstation-qt/achievementlogindialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "ui_achievementlogindialog.h" diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index b4a75c93d..913b83b8f 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "achievementsettingswidget.h" #include "achievementlogindialog.h" diff --git a/src/duckstation-qt/achievementsettingswidget.h b/src/duckstation-qt/achievementsettingswidget.h index 3d91f2094..9cb58b357 100644 --- a/src/duckstation-qt/achievementsettingswidget.h +++ b/src/duckstation-qt/achievementsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include diff --git a/src/duckstation-qt/advancedsettingswidget.cpp b/src/duckstation-qt/advancedsettingswidget.cpp index c457b2f96..a99e08082 100644 --- a/src/duckstation-qt/advancedsettingswidget.cpp +++ b/src/duckstation-qt/advancedsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "advancedsettingswidget.h" #include "core/gpu_types.h" diff --git a/src/duckstation-qt/advancedsettingswidget.h b/src/duckstation-qt/advancedsettingswidget.h index f30d79275..3ddfbcdb3 100644 --- a/src/duckstation-qt/advancedsettingswidget.h +++ b/src/duckstation-qt/advancedsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp index c044d2a89..b718bd133 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "audiosettingswidget.h" #include "qtutils.h" diff --git a/src/duckstation-qt/audiosettingswidget.h b/src/duckstation-qt/audiosettingswidget.h index 1b23d5d54..1cf1ae944 100644 --- a/src/duckstation-qt/audiosettingswidget.h +++ b/src/duckstation-qt/audiosettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/autoupdaterdialog.cpp b/src/duckstation-qt/autoupdaterdialog.cpp index 5c0e7fff0..82521fcad 100644 --- a/src/duckstation-qt/autoupdaterdialog.cpp +++ b/src/duckstation-qt/autoupdaterdialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "autoupdaterdialog.h" #include "mainwindow.h" @@ -118,21 +118,22 @@ bool AutoUpdaterDialog::warnAboutUnofficialBuild() // // To those distributing their own builds or packages of DuckStation, and seeing this message: // - // This message is here for a reason. Under the terms of the license, you are within your rights to distribute your - // own builds of my application. However, it is a headache for me, as users run into broken functionality, or end up - // on untested/preview commits that have not been adequately tested, and I cannot resolve their issues. I provide - // builds for a range of platforms that covers almost all use cases, and can guarantee quality of these builds. + // DuckStation is licensed under the PolyForm Strict License 1.0.0. // - // If you must distribute builds/packages, per the GPL, modified builds should be clearly marked as such. - // This message is thus one way of meeting the requirement. See Section 5 of the GPLv3: - // https://www.gnu.org/licenses/gpl-3.0.en.html#section5 + // This means that you do NOT have permission to re-distribute your own builds of DuckStation. Modifying DuckStation + // for personal use is fine, but you cannot distribute builds with your changes. I give permission to re-distribute + // the official builds from https://www.duckstation.org/ and https://github.com/stenzek/duckstation, so long as they + // are left intact, without modification. I welcome and appreciate any pull requests made to the official repository + // at https://github.com/stenzek/duckstation. // - // This includes building the binary with any method that does not match the official release, including dependencies, - // as it is not uncommon for differing dependency versions to create issues I cannot reproduce. + // I made the decision to switch to the PolyForm license because of numerous "forks" that were created purely for + // generating money for the person who knocked it off, and always died, leaving the community with multiple builds to + // choose from, most of which were out of date and broken, and endless confusion. Other forks copy/pasted upstream + // changes without attribution, violating copyright. // - // You should also provide user support for your package, and not direct them to upstream, as any users that ask for - // community help will be instructed to download a supported release instead. + // Thanks, and I hope you understand. // + #if !__has_include("scmversion/tag.h") && !defined(_DEBUG) constexpr const char* CONFIG_SECTION = "UI"; constexpr const char* CONFIG_KEY = "UnofficialBuildWarningConfirmed"; @@ -141,12 +142,13 @@ bool AutoUpdaterDialog::warnAboutUnofficialBuild() constexpr int DELAY_SECONDS = 5; - const QString message = QStringLiteral( - "

You are not using an official release!

If you continue to use this build, expect to run into " - "issues.

No assistance will be provided by the developers or community, as we cannot fix " - "broken functionality in builds we do not control.

We strongly recommend downloading an " - "official release from duckstation.org.

Do you want to exit and " - "open this page now?

"); + const QString message = + QStringLiteral("

You are not using an official release!

DuckStation is licensed under the PolyForm " + "Strict License 1.0.0, which does not allow unofficial builds to be distributed.

" + "

If you are a developer and using a local build, you can check the box below and continue.

" + "

Otherwise, you should delete this build and download an official release from " + "duckstation.org.

Do you want to exit and " + "open this page now?

"); QMessageBox mbox; mbox.setIcon(QMessageBox::Warning); diff --git a/src/duckstation-qt/autoupdaterdialog.h b/src/duckstation-qt/autoupdaterdialog.h index 1da1b90ef..95c14c2da 100644 --- a/src/duckstation-qt/autoupdaterdialog.h +++ b/src/duckstation-qt/autoupdaterdialog.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/biossettingswidget.cpp b/src/duckstation-qt/biossettingswidget.cpp index 6324ecad3..557fbcfc1 100644 --- a/src/duckstation-qt/biossettingswidget.cpp +++ b/src/duckstation-qt/biossettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "biossettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/biossettingswidget.h b/src/duckstation-qt/biossettingswidget.h index 66c7d1814..59dbd1bcf 100644 --- a/src/duckstation-qt/biossettingswidget.h +++ b/src/duckstation-qt/biossettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "core/types.h" diff --git a/src/duckstation-qt/cheatcodeeditordialog.cpp b/src/duckstation-qt/cheatcodeeditordialog.cpp index a8c698d5e..1aa714724 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.cpp +++ b/src/duckstation-qt/cheatcodeeditordialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cheatcodeeditordialog.h" #include diff --git a/src/duckstation-qt/cheatcodeeditordialog.h b/src/duckstation-qt/cheatcodeeditordialog.h index bfbc9025a..ba7b13a23 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.h +++ b/src/duckstation-qt/cheatcodeeditordialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "core/cheats.h" diff --git a/src/duckstation-qt/cheatmanagerwindow.cpp b/src/duckstation-qt/cheatmanagerwindow.cpp index 21f40062a..04458f7a7 100644 --- a/src/duckstation-qt/cheatmanagerwindow.cpp +++ b/src/duckstation-qt/cheatmanagerwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cheatmanagerwindow.h" #include "cheatcodeeditordialog.h" diff --git a/src/duckstation-qt/cheatmanagerwindow.h b/src/duckstation-qt/cheatmanagerwindow.h index f82d3698d..dae9c05eb 100644 --- a/src/duckstation-qt/cheatmanagerwindow.h +++ b/src/duckstation-qt/cheatmanagerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/colorpickerbutton.cpp b/src/duckstation-qt/colorpickerbutton.cpp index 5bb59030c..f4bb68af3 100644 --- a/src/duckstation-qt/colorpickerbutton.cpp +++ b/src/duckstation-qt/colorpickerbutton.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "colorpickerbutton.h" #include "qtutils.h" diff --git a/src/duckstation-qt/colorpickerbutton.h b/src/duckstation-qt/colorpickerbutton.h index c15908301..0d9525622 100644 --- a/src/duckstation-qt/colorpickerbutton.h +++ b/src/duckstation-qt/colorpickerbutton.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/consolesettingswidget.cpp b/src/duckstation-qt/consolesettingswidget.cpp index 19ac11cfd..e8e78379a 100644 --- a/src/duckstation-qt/consolesettingswidget.cpp +++ b/src/duckstation-qt/consolesettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "consolesettingswidget.h" #include "qtutils.h" diff --git a/src/duckstation-qt/consolesettingswidget.h b/src/duckstation-qt/consolesettingswidget.h index 1c4161306..176f40f51 100644 --- a/src/duckstation-qt/consolesettingswidget.h +++ b/src/duckstation-qt/consolesettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp index bffca6bce..5f0c4783b 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "controllerbindingwidgets.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/controllerbindingwidgets.h b/src/duckstation-qt/controllerbindingwidgets.h index 48dff0a19..1963812dc 100644 --- a/src/duckstation-qt/controllerbindingwidgets.h +++ b/src/duckstation-qt/controllerbindingwidgets.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/controllerglobalsettingswidget.cpp b/src/duckstation-qt/controllerglobalsettingswidget.cpp index 0d64005de..7d3a7c473 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.cpp +++ b/src/duckstation-qt/controllerglobalsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "controllerglobalsettingswidget.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/controllerglobalsettingswidget.h b/src/duckstation-qt/controllerglobalsettingswidget.h index b229db212..3198c150e 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.h +++ b/src/duckstation-qt/controllerglobalsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/controllersettingswindow.cpp b/src/duckstation-qt/controllersettingswindow.cpp index 3da41c4d2..53917693a 100644 --- a/src/duckstation-qt/controllersettingswindow.cpp +++ b/src/duckstation-qt/controllersettingswindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "controllersettingswindow.h" #include "controllerbindingwidgets.h" diff --git a/src/duckstation-qt/controllersettingswindow.h b/src/duckstation-qt/controllersettingswindow.h index 7f080d627..b8e5242ec 100644 --- a/src/duckstation-qt/controllersettingswindow.h +++ b/src/duckstation-qt/controllersettingswindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/controllersettingwidgetbinder.h b/src/duckstation-qt/controllersettingwidgetbinder.h index 4f3f328f9..f89f73e69 100644 --- a/src/duckstation-qt/controllersettingwidgetbinder.h +++ b/src/duckstation-qt/controllersettingwidgetbinder.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/coverdownloaddialog.cpp b/src/duckstation-qt/coverdownloaddialog.cpp index 010f3159f..e403e80ed 100644 --- a/src/duckstation-qt/coverdownloaddialog.cpp +++ b/src/duckstation-qt/coverdownloaddialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "coverdownloaddialog.h" #include "qthost.h" diff --git a/src/duckstation-qt/coverdownloaddialog.h b/src/duckstation-qt/coverdownloaddialog.h index 18f88a5ba..b5950a353 100644 --- a/src/duckstation-qt/coverdownloaddialog.h +++ b/src/duckstation-qt/coverdownloaddialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/timer.h" diff --git a/src/duckstation-qt/debuggermodels.cpp b/src/duckstation-qt/debuggermodels.cpp index eff69bd2e..cd97384fe 100644 --- a/src/duckstation-qt/debuggermodels.cpp +++ b/src/duckstation-qt/debuggermodels.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "debuggermodels.h" diff --git a/src/duckstation-qt/debuggermodels.h b/src/duckstation-qt/debuggermodels.h index 1d0e0c93c..827a4c5d9 100644 --- a/src/duckstation-qt/debuggermodels.h +++ b/src/duckstation-qt/debuggermodels.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/debuggerwindow.cpp b/src/duckstation-qt/debuggerwindow.cpp index 153c3422d..7e5b3e5eb 100644 --- a/src/duckstation-qt/debuggerwindow.cpp +++ b/src/duckstation-qt/debuggerwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "debuggerwindow.h" #include "debuggermodels.h" diff --git a/src/duckstation-qt/debuggerwindow.h b/src/duckstation-qt/debuggerwindow.h index 83816f45c..a2a6ae89d 100644 --- a/src/duckstation-qt/debuggerwindow.h +++ b/src/duckstation-qt/debuggerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/displaywidget.cpp b/src/duckstation-qt/displaywidget.cpp index 91adb2a1d..cae432c11 100644 --- a/src/duckstation-qt/displaywidget.cpp +++ b/src/duckstation-qt/displaywidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "displaywidget.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/displaywidget.h b/src/duckstation-qt/displaywidget.h index be357fe9b..6a9fe6500 100644 --- a/src/duckstation-qt/displaywidget.h +++ b/src/duckstation-qt/displaywidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/emulationsettingswidget.cpp b/src/duckstation-qt/emulationsettingswidget.cpp index 8d98e412f..4a56358c2 100644 --- a/src/duckstation-qt/emulationsettingswidget.cpp +++ b/src/duckstation-qt/emulationsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "emulationsettingswidget.h" #include "core/system.h" diff --git a/src/duckstation-qt/emulationsettingswidget.h b/src/duckstation-qt/emulationsettingswidget.h index 2eab3df4a..28babe58b 100644 --- a/src/duckstation-qt/emulationsettingswidget.h +++ b/src/duckstation-qt/emulationsettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/foldersettingswidget.cpp b/src/duckstation-qt/foldersettingswidget.cpp index 803e7c39c..fb74941b5 100644 --- a/src/duckstation-qt/foldersettingswidget.cpp +++ b/src/duckstation-qt/foldersettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include #include diff --git a/src/duckstation-qt/foldersettingswidget.h b/src/duckstation-qt/foldersettingswidget.h index 8c2a68483..1aa2b4167 100644 --- a/src/duckstation-qt/foldersettingswidget.h +++ b/src/duckstation-qt/foldersettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/gamelistmodel.cpp b/src/duckstation-qt/gamelistmodel.cpp index 99bd8f613..b37f8da05 100644 --- a/src/duckstation-qt/gamelistmodel.cpp +++ b/src/duckstation-qt/gamelistmodel.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gamelistmodel.h" #include "qthost.h" diff --git a/src/duckstation-qt/gamelistmodel.h b/src/duckstation-qt/gamelistmodel.h index c156f6f30..175f36554 100644 --- a/src/duckstation-qt/gamelistmodel.h +++ b/src/duckstation-qt/gamelistmodel.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/gamelistrefreshthread.cpp b/src/duckstation-qt/gamelistrefreshthread.cpp index d493e2ebf..8b504448d 100644 --- a/src/duckstation-qt/gamelistrefreshthread.cpp +++ b/src/duckstation-qt/gamelistrefreshthread.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gamelistrefreshthread.h" #include "qtutils.h" diff --git a/src/duckstation-qt/gamelistrefreshthread.h b/src/duckstation-qt/gamelistrefreshthread.h index d2a409ffc..8ef9863d7 100644 --- a/src/duckstation-qt/gamelistrefreshthread.h +++ b/src/duckstation-qt/gamelistrefreshthread.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/gamelistsettingswidget.cpp b/src/duckstation-qt/gamelistsettingswidget.cpp index f38132e31..892734091 100644 --- a/src/duckstation-qt/gamelistsettingswidget.cpp +++ b/src/duckstation-qt/gamelistsettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gamelistsettingswidget.h" #include "core/game_list.h" diff --git a/src/duckstation-qt/gamelistsettingswidget.h b/src/duckstation-qt/gamelistsettingswidget.h index 1427c3a7b..ad7558b7f 100644 --- a/src/duckstation-qt/gamelistsettingswidget.h +++ b/src/duckstation-qt/gamelistsettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp index ca907cb05..f0f99128d 100644 --- a/src/duckstation-qt/gamelistwidget.cpp +++ b/src/duckstation-qt/gamelistwidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gamelistwidget.h" #include "gamelistmodel.h" diff --git a/src/duckstation-qt/gamelistwidget.h b/src/duckstation-qt/gamelistwidget.h index b3e325b26..a06b33415 100644 --- a/src/duckstation-qt/gamelistwidget.h +++ b/src/duckstation-qt/gamelistwidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "ui_emptygamelistwidget.h" diff --git a/src/duckstation-qt/gamesummarywidget.cpp b/src/duckstation-qt/gamesummarywidget.cpp index aafb92ebb..562222b9f 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gamesummarywidget.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/gamesummarywidget.h b/src/duckstation-qt/gamesummarywidget.h index b27526f05..332190c28 100644 --- a/src/duckstation-qt/gamesummarywidget.h +++ b/src/duckstation-qt/gamesummarywidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index f3c585191..f2e9861a9 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "graphicssettingswidget.h" #include "qtutils.h" diff --git a/src/duckstation-qt/graphicssettingswidget.h b/src/duckstation-qt/graphicssettingswidget.h index 361ecd109..6f92cb047 100644 --- a/src/duckstation-qt/graphicssettingswidget.h +++ b/src/duckstation-qt/graphicssettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/hotkeysettingswidget.cpp b/src/duckstation-qt/hotkeysettingswidget.cpp index f71b8509a..9ff862422 100644 --- a/src/duckstation-qt/hotkeysettingswidget.cpp +++ b/src/duckstation-qt/hotkeysettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "hotkeysettingswidget.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/hotkeysettingswidget.h b/src/duckstation-qt/hotkeysettingswidget.h index 864a1fab9..b51cecc8b 100644 --- a/src/duckstation-qt/hotkeysettingswidget.h +++ b/src/duckstation-qt/hotkeysettingswidget.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/inputbindingdialog.cpp b/src/duckstation-qt/inputbindingdialog.cpp index 5cc3a20cc..cb7089ddd 100644 --- a/src/duckstation-qt/inputbindingdialog.cpp +++ b/src/duckstation-qt/inputbindingdialog.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "inputbindingdialog.h" #include "controllersettingwidgetbinder.h" diff --git a/src/duckstation-qt/inputbindingdialog.h b/src/duckstation-qt/inputbindingdialog.h index 2796ebf6f..8d596bf4d 100644 --- a/src/duckstation-qt/inputbindingdialog.h +++ b/src/duckstation-qt/inputbindingdialog.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/inputbindingwidgets.cpp b/src/duckstation-qt/inputbindingwidgets.cpp index ec3b543a1..8c6e22d2d 100644 --- a/src/duckstation-qt/inputbindingwidgets.cpp +++ b/src/duckstation-qt/inputbindingwidgets.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "inputbindingwidgets.h" #include "controllersettingswindow.h" diff --git a/src/duckstation-qt/inputbindingwidgets.h b/src/duckstation-qt/inputbindingwidgets.h index 087e0c195..7f4ef318a 100644 --- a/src/duckstation-qt/inputbindingwidgets.h +++ b/src/duckstation-qt/inputbindingwidgets.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/duckstation-qt/interfacesettingswidget.cpp b/src/duckstation-qt/interfacesettingswidget.cpp index b0f394fb4..0574374e6 100644 --- a/src/duckstation-qt/interfacesettingswidget.cpp +++ b/src/duckstation-qt/interfacesettingswidget.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "interfacesettingswidget.h" #include "autoupdaterdialog.h" diff --git a/src/duckstation-qt/interfacesettingswidget.h b/src/duckstation-qt/interfacesettingswidget.h index 0be63cea6..bcc470fbd 100644 --- a/src/duckstation-qt/interfacesettingswidget.h +++ b/src/duckstation-qt/interfacesettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/logwindow.cpp b/src/duckstation-qt/logwindow.cpp index b405cf722..48c215b19 100644 --- a/src/duckstation-qt/logwindow.cpp +++ b/src/duckstation-qt/logwindow.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "logwindow.h" #include "mainwindow.h" diff --git a/src/duckstation-qt/logwindow.h b/src/duckstation-qt/logwindow.h index d6054d940..921545cbe 100644 --- a/src/duckstation-qt/logwindow.h +++ b/src/duckstation-qt/logwindow.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index 7cbfd26bb..dba0538b7 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "mainwindow.h" #include "aboutdialog.h" diff --git a/src/duckstation-qt/mainwindow.h b/src/duckstation-qt/mainwindow.h index fba4d7e36..bf1dd5ccc 100644 --- a/src/duckstation-qt/mainwindow.h +++ b/src/duckstation-qt/mainwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/memorycardeditorwindow.cpp b/src/duckstation-qt/memorycardeditorwindow.cpp index 6908489ee..8219c45f9 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memorycardeditorwindow.h" #include "qtutils.h" diff --git a/src/duckstation-qt/memorycardeditorwindow.h b/src/duckstation-qt/memorycardeditorwindow.h index eeacf63e9..c451010b6 100644 --- a/src/duckstation-qt/memorycardeditorwindow.h +++ b/src/duckstation-qt/memorycardeditorwindow.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/memorycardsettingswidget.cpp b/src/duckstation-qt/memorycardsettingswidget.cpp index ce5d49c99..b374e221a 100644 --- a/src/duckstation-qt/memorycardsettingswidget.cpp +++ b/src/duckstation-qt/memorycardsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memorycardsettingswidget.h" diff --git a/src/duckstation-qt/memorycardsettingswidget.h b/src/duckstation-qt/memorycardsettingswidget.h index 6edddf597..5edbfcf73 100644 --- a/src/duckstation-qt/memorycardsettingswidget.h +++ b/src/duckstation-qt/memorycardsettingswidget.h @@ -1,7 +1,8 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once + #include "core/types.h" #include diff --git a/src/duckstation-qt/memoryscannerwindow.cpp b/src/duckstation-qt/memoryscannerwindow.cpp index 45d66e6f0..295020d11 100644 --- a/src/duckstation-qt/memoryscannerwindow.cpp +++ b/src/duckstation-qt/memoryscannerwindow.cpp @@ -1,16 +1,19 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "memoryscannerwindow.h" #include "cheatcodeeditordialog.h" -#include "common/assert.h" -#include "common/string_util.h" +#include "qthost.h" +#include "qtutils.h" + #include "core/bus.h" #include "core/cpu_core.h" #include "core/host.h" #include "core/system.h" -#include "qthost.h" -#include "qtutils.h" + +#include "common/assert.h" +#include "common/string_util.h" + #include #include #include @@ -91,7 +94,8 @@ MemoryScannerWindow::MemoryScannerWindow() : QWidget() m_ui.setupUi(this); connectUi(); - m_ui.cheatEngineAddress->setText(tr("Address of RAM for HxD Usage: 0x%1").arg(reinterpret_cast(Bus::g_unprotected_ram), 16, 16, QChar('0'))); + m_ui.cheatEngineAddress->setText(tr("Address of RAM for HxD Usage: 0x%1") + .arg(reinterpret_cast(Bus::g_unprotected_ram), 16, 16, QChar('0'))); } MemoryScannerWindow::~MemoryScannerWindow() = default; diff --git a/src/duckstation-qt/memoryscannerwindow.h b/src/duckstation-qt/memoryscannerwindow.h index 282ff70f2..334968024 100644 --- a/src/duckstation-qt/memoryscannerwindow.h +++ b/src/duckstation-qt/memoryscannerwindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/pch.cpp b/src/duckstation-qt/pch.cpp index ef4256aee..5b7d58117 100644 --- a/src/duckstation-qt/pch.cpp +++ b/src/duckstation-qt/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "pch.h" diff --git a/src/duckstation-qt/pch.h b/src/duckstation-qt/pch.h index 9a5294ade..d36016037 100644 --- a/src/duckstation-qt/pch.h +++ b/src/duckstation-qt/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/postprocessingsettingswidget.cpp b/src/duckstation-qt/postprocessingsettingswidget.cpp index 6ee7b0b9a..65b7e26e9 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.cpp +++ b/src/duckstation-qt/postprocessingsettingswidget.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "postprocessingsettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/postprocessingsettingswidget.h b/src/duckstation-qt/postprocessingsettingswidget.h index d20ad48d2..52afb2868 100644 --- a/src/duckstation-qt/postprocessingsettingswidget.h +++ b/src/duckstation-qt/postprocessingsettingswidget.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp index 83bd51aff..f9dab3267 100644 --- a/src/duckstation-qt/qthost.cpp +++ b/src/duckstation-qt/qthost.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "qthost.h" #include "autoupdaterdialog.h" diff --git a/src/duckstation-qt/qthost.h b/src/duckstation-qt/qthost.h index 6648c67cf..22a543013 100644 --- a/src/duckstation-qt/qthost.h +++ b/src/duckstation-qt/qthost.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/qtkeycodes.cpp b/src/duckstation-qt/qtkeycodes.cpp index 76871f7ad..bfc21f382 100644 --- a/src/duckstation-qt/qtkeycodes.cpp +++ b/src/duckstation-qt/qtkeycodes.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "qtutils.h" diff --git a/src/duckstation-qt/qtprogresscallback.cpp b/src/duckstation-qt/qtprogresscallback.cpp index 18fe69844..c9940a1e3 100644 --- a/src/duckstation-qt/qtprogresscallback.cpp +++ b/src/duckstation-qt/qtprogresscallback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "qtprogresscallback.h" #include "qtutils.h" diff --git a/src/duckstation-qt/qtprogresscallback.h b/src/duckstation-qt/qtprogresscallback.h index 1733622d2..778d06b92 100644 --- a/src/duckstation-qt/qtprogresscallback.h +++ b/src/duckstation-qt/qtprogresscallback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/qtthemes.cpp b/src/duckstation-qt/qtthemes.cpp index 8d5c3a281..ab2e1b23a 100644 --- a/src/duckstation-qt/qtthemes.cpp +++ b/src/duckstation-qt/qtthemes.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "interfacesettingswidget.h" #include "qthost.h" diff --git a/src/duckstation-qt/qttranslations.cpp b/src/duckstation-qt/qttranslations.cpp index d2232fdac..d6eab0e7a 100644 --- a/src/duckstation-qt/qttranslations.cpp +++ b/src/duckstation-qt/qttranslations.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "mainwindow.h" #include "qthost.h" diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp index 74df8b86f..2b9e74c10 100644 --- a/src/duckstation-qt/qtutils.cpp +++ b/src/duckstation-qt/qtutils.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "qtutils.h" diff --git a/src/duckstation-qt/qtutils.h b/src/duckstation-qt/qtutils.h index 2b6bb16f6..c8f0bae41 100644 --- a/src/duckstation-qt/qtutils.h +++ b/src/duckstation-qt/qtutils.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/selectdiscdialog.cpp b/src/duckstation-qt/selectdiscdialog.cpp index 61276303e..e2e46b560 100644 --- a/src/duckstation-qt/selectdiscdialog.cpp +++ b/src/duckstation-qt/selectdiscdialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "selectdiscdialog.h" #include "qtutils.h" diff --git a/src/duckstation-qt/selectdiscdialog.h b/src/duckstation-qt/selectdiscdialog.h index 36dc88317..798d4ec66 100644 --- a/src/duckstation-qt/selectdiscdialog.h +++ b/src/duckstation-qt/selectdiscdialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/timer.h" diff --git a/src/duckstation-qt/settingswindow.cpp b/src/duckstation-qt/settingswindow.cpp index 67a7eb90d..edbc56eef 100644 --- a/src/duckstation-qt/settingswindow.cpp +++ b/src/duckstation-qt/settingswindow.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "settingswindow.h" #include "advancedsettingswidget.h" @@ -122,7 +122,9 @@ void SettingsWindow::addPages() m_post_processing_settings = new PostProcessingSettingsWidget(this, m_ui.settingsContainer), tr("Post-Processing"), QStringLiteral("sun-fill"), tr("Post-Processing Settings
Post processing allows you to alter the appearance of the image " - "displayed on the screen with various filters. Shaders will be executed in sequence.")); + "displayed on the screen with various filters. Shaders will be executed in sequence. Additional shaders can be " + "downloaded from %1.") + .arg("https://github.com/duckstation/shaders")); addWidget( m_audio_settings = new AudioSettingsWidget(this, m_ui.settingsContainer), tr("Audio"), QStringLiteral("volume-up-line"), @@ -209,6 +211,7 @@ void SettingsWindow::connectUi() m_ui.settingsCategory->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); m_ui.settingsCategory->setCurrentRow(0); m_ui.settingsContainer->setCurrentIndex(0); + m_ui.helpText->setOpenExternalLinks(true); m_ui.helpText->setText(m_category_help_text[0]); connect(m_ui.settingsCategory, &QListWidget::currentRowChanged, this, &SettingsWindow::onCategoryCurrentRowChanged); connect(m_ui.close, &QPushButton::clicked, this, &SettingsWindow::close); diff --git a/src/duckstation-qt/settingswindow.h b/src/duckstation-qt/settingswindow.h index d6ef46066..a170ffdd4 100644 --- a/src/duckstation-qt/settingswindow.h +++ b/src/duckstation-qt/settingswindow.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "ui_settingswindow.h" diff --git a/src/duckstation-qt/settingswindow.ui b/src/duckstation-qt/settingswindow.ui index 6f7f1e061..1478fd80b 100644 --- a/src/duckstation-qt/settingswindow.ui +++ b/src/duckstation-qt/settingswindow.ui @@ -20,7 +20,7 @@ DuckStation Settings - + :/icons/duck.png:/icons/duck.png @@ -62,25 +62,6 @@ - - - - - 0 - 100 - - - - - 16777215 - 100 - - - - true - - - @@ -107,7 +88,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -126,10 +107,32 @@ + + + + + 0 + 100 + + + + + 16777215 + 100 + + + + true + + + Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + + + - + diff --git a/src/duckstation-qt/settingwidgetbinder.h b/src/duckstation-qt/settingwidgetbinder.h index 18a426f69..70467a7f6 100644 --- a/src/duckstation-qt/settingwidgetbinder.h +++ b/src/duckstation-qt/settingwidgetbinder.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/setupwizarddialog.cpp b/src/duckstation-qt/setupwizarddialog.cpp index fb8e5e441..5cb8a85b4 100644 --- a/src/duckstation-qt/setupwizarddialog.cpp +++ b/src/duckstation-qt/setupwizarddialog.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "setupwizarddialog.h" #include "controllersettingwidgetbinder.h" diff --git a/src/duckstation-qt/setupwizarddialog.h b/src/duckstation-qt/setupwizarddialog.h index ad5bad941..c45c620f9 100644 --- a/src/duckstation-qt/setupwizarddialog.h +++ b/src/duckstation-qt/setupwizarddialog.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin . -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/duckstation-qt/vcruntimecheck.cpp b/src/duckstation-qt/vcruntimecheck.cpp index 501782068..f2c255442 100644 --- a/src/duckstation-qt/vcruntimecheck.cpp +++ b/src/duckstation-qt/vcruntimecheck.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "common/windows_headers.h" #include diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp index fb64d24d2..c2901b55a 100644 --- a/src/duckstation-regtest/regtest_host.cpp +++ b/src/duckstation-regtest/regtest_host.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "core/achievements.h" #include "core/controller.h" diff --git a/src/scmversion/scmversion.h b/src/scmversion/scmversion.h index f84db2654..8a62b94b7 100644 --- a/src/scmversion/scmversion.h +++ b/src/scmversion/scmversion.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/updater/Info.plist.in b/src/updater/Info.plist.in index 3e0a98227..b7d6ca081 100644 --- a/src/updater/Info.plist.in +++ b/src/updater/Info.plist.in @@ -13,7 +13,7 @@ CFBundlePackageType APPL NSHumanReadableCopyright - Licensed under GPL version 3 + 2019-2024 Connor McLaughlin <stenzek@gmail.com> LSMinimumSystemVersion ${CMAKE_OSX_DEPLOYMENT_TARGET} NSHighResolutionCapable diff --git a/src/updater/cocoa_main.mm b/src/updater/cocoa_main.mm index 5df36a6c8..f233dba8d 100644 --- a/src/updater/cocoa_main.mm +++ b/src/updater/cocoa_main.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cocoa_progress_callback.h" #include "updater.h" diff --git a/src/updater/cocoa_progress_callback.h b/src/updater/cocoa_progress_callback.h index 8acf054a3..7265ece83 100644 --- a/src/updater/cocoa_progress_callback.h +++ b/src/updater/cocoa_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/updater/cocoa_progress_callback.mm b/src/updater/cocoa_progress_callback.mm index 207d0caeb..f384bef0d 100644 --- a/src/updater/cocoa_progress_callback.mm +++ b/src/updater/cocoa_progress_callback.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cocoa_progress_callback.h" diff --git a/src/updater/updater.cpp b/src/updater/updater.cpp index 2501f9ead..699653c7d 100644 --- a/src/updater/updater.cpp +++ b/src/updater/updater.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "updater.h" diff --git a/src/updater/updater.h b/src/updater/updater.h index 6cf39d9d9..8989b14a7 100644 --- a/src/updater/updater.h +++ b/src/updater/updater.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/progress_callback.h" diff --git a/src/updater/win32_main.cpp b/src/updater/win32_main.cpp index 08728d97f..61b7bd4cb 100644 --- a/src/updater/win32_main.cpp +++ b/src/updater/win32_main.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "updater.h" #include "win32_progress_callback.h" diff --git a/src/updater/win32_progress_callback.cpp b/src/updater/win32_progress_callback.cpp index e35742e16..0bbf727c3 100644 --- a/src/updater/win32_progress_callback.cpp +++ b/src/updater/win32_progress_callback.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "win32_progress_callback.h" diff --git a/src/updater/win32_progress_callback.h b/src/updater/win32_progress_callback.h index 443426a61..e0860a83d 100644 --- a/src/updater/win32_progress_callback.h +++ b/src/updater/win32_progress_callback.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/progress_callback.h" diff --git a/src/util/cd_image.cpp b/src/util/cd_image.cpp index effd2eaeb..029f3434c 100644 --- a/src/util/cd_image.cpp +++ b/src/util/cd_image.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" diff --git a/src/util/cd_image.h b/src/util/cd_image.h index c1ae38257..8e870ef06 100644 --- a/src/util/cd_image.h +++ b/src/util/cd_image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/cd_image_bin.cpp b/src/util/cd_image_bin.cpp index 0de1f1bf4..986cec348 100644 --- a/src/util/cd_image_bin.cpp +++ b/src/util/cd_image_bin.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_chd.cpp b/src/util/cd_image_chd.cpp index 692589d3a..bcabe4cb3 100644 --- a/src/util/cd_image_chd.cpp +++ b/src/util/cd_image_chd.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_cue.cpp b/src/util/cd_image_cue.cpp index 121dacc4f..b4f80961a 100644 --- a/src/util/cd_image_cue.cpp +++ b/src/util/cd_image_cue.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_device.cpp b/src/util/cd_image_device.cpp index 5ef2bd1b1..56a19f13c 100644 --- a/src/util/cd_image_device.cpp +++ b/src/util/cd_image_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "assert.h" #include "cd_image.h" diff --git a/src/util/cd_image_ecm.cpp b/src/util/cd_image_ecm.cpp index 860a67a56..20f9d915a 100644 --- a/src/util/cd_image_ecm.cpp +++ b/src/util/cd_image_ecm.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_hasher.cpp b/src/util/cd_image_hasher.cpp index 6a9862cf5..e9b650931 100644 --- a/src/util/cd_image_hasher.cpp +++ b/src/util/cd_image_hasher.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image_hasher.h" #include "cd_image.h" diff --git a/src/util/cd_image_hasher.h b/src/util/cd_image_hasher.h index 70b69ef5b..ae5264c56 100644 --- a/src/util/cd_image_hasher.h +++ b/src/util/cd_image_hasher.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/progress_callback.h" diff --git a/src/util/cd_image_m3u.cpp b/src/util/cd_image_m3u.cpp index 97bd4510d..2805b21cb 100644 --- a/src/util/cd_image_m3u.cpp +++ b/src/util/cd_image_m3u.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_mds.cpp b/src/util/cd_image_mds.cpp index c570e81b3..f276779b5 100644 --- a/src/util/cd_image_mds.cpp +++ b/src/util/cd_image_mds.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "assert.h" #include "cd_image.h" diff --git a/src/util/cd_image_memory.cpp b/src/util/cd_image_memory.cpp index f29455b17..69bfd2338 100644 --- a/src/util/cd_image_memory.cpp +++ b/src/util/cd_image_memory.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_pbp.cpp b/src/util/cd_image_pbp.cpp index e6da1e408..be4740e9b 100644 --- a/src/util/cd_image_pbp.cpp +++ b/src/util/cd_image_pbp.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_image_ppf.cpp b/src/util/cd_image_ppf.cpp index eb56d8ca9..f9f815f95 100644 --- a/src/util/cd_image_ppf.cpp +++ b/src/util/cd_image_ppf.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_image.h" #include "cd_subchannel_replacement.h" diff --git a/src/util/cd_subchannel_replacement.cpp b/src/util/cd_subchannel_replacement.cpp index e2b9accd0..b8ad0f8ae 100644 --- a/src/util/cd_subchannel_replacement.cpp +++ b/src/util/cd_subchannel_replacement.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cd_subchannel_replacement.h" #include "common/file_system.h" diff --git a/src/util/cd_subchannel_replacement.h b/src/util/cd_subchannel_replacement.h index a0111fe7a..e9d401078 100644 --- a/src/util/cd_subchannel_replacement.h +++ b/src/util/cd_subchannel_replacement.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "cd_image.h" diff --git a/src/util/compress_helpers.cpp b/src/util/compress_helpers.cpp index 614493558..f61d631d0 100644 --- a/src/util/compress_helpers.cpp +++ b/src/util/compress_helpers.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "compress_helpers.h" diff --git a/src/util/compress_helpers.h b/src/util/compress_helpers.h index d63902b48..e1a779f5f 100644 --- a/src/util/compress_helpers.h +++ b/src/util/compress_helpers.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp index 754c8a3d7..4e49f39e4 100644 --- a/src/util/cubeb_audio_stream.cpp +++ b/src/util/cubeb_audio_stream.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "host.h" #include "imgui_manager.h" diff --git a/src/util/cue_parser.cpp b/src/util/cue_parser.cpp index 95a3bcc39..ed3000a67 100644 --- a/src/util/cue_parser.cpp +++ b/src/util/cue_parser.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "cue_parser.h" diff --git a/src/util/cue_parser.h b/src/util/cue_parser.h index 3b3d82f4f..694f81148 100644 --- a/src/util/cue_parser.h +++ b/src/util/cue_parser.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "cd_image.h" diff --git a/src/util/d3d11_device.cpp b/src/util/d3d11_device.cpp index 784c77703..5b88ca7d3 100644 --- a/src/util/d3d11_device.cpp +++ b/src/util/d3d11_device.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d11_device.h" #include "core/host.h" // TODO: Remove me diff --git a/src/util/d3d11_device.h b/src/util/d3d11_device.h index d0a40db23..db1965680 100644 --- a/src/util/d3d11_device.h +++ b/src/util/d3d11_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d11_pipeline.cpp b/src/util/d3d11_pipeline.cpp index 424c7159f..1ebc9300a 100644 --- a/src/util/d3d11_pipeline.cpp +++ b/src/util/d3d11_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d11_pipeline.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_pipeline.h b/src/util/d3d11_pipeline.h index b6515b3e6..7138504a8 100644 --- a/src/util/d3d11_pipeline.h +++ b/src/util/d3d11_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d11_stream_buffer.cpp b/src/util/d3d11_stream_buffer.cpp index c8fd3c24c..0066fbc72 100644 --- a/src/util/d3d11_stream_buffer.cpp +++ b/src/util/d3d11_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d11_stream_buffer.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_stream_buffer.h b/src/util/d3d11_stream_buffer.h index 23fc7e11e..9c40ce477 100644 --- a/src/util/d3d11_stream_buffer.h +++ b/src/util/d3d11_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d11_texture.cpp b/src/util/d3d11_texture.cpp index 41aecaf10..61c74ca67 100644 --- a/src/util/d3d11_texture.cpp +++ b/src/util/d3d11_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d11_texture.h" #include "d3d11_device.h" diff --git a/src/util/d3d11_texture.h b/src/util/d3d11_texture.h index cf338da7a..5200b105f 100644 --- a/src/util/d3d11_texture.h +++ b/src/util/d3d11_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d12_builders.cpp b/src/util/d3d12_builders.cpp index b730a2967..d0d1cf989 100644 --- a/src/util/d3d12_builders.cpp +++ b/src/util/d3d12_builders.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_builders.h" #include "d3d12_device.h" diff --git a/src/util/d3d12_builders.h b/src/util/d3d12_builders.h index 26aad3bc5..47dac922a 100644 --- a/src/util/d3d12_builders.h +++ b/src/util/d3d12_builders.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d12_descriptor_heap_manager.cpp b/src/util/d3d12_descriptor_heap_manager.cpp index f80c17649..560f492de 100644 --- a/src/util/d3d12_descriptor_heap_manager.cpp +++ b/src/util/d3d12_descriptor_heap_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_descriptor_heap_manager.h" diff --git a/src/util/d3d12_descriptor_heap_manager.h b/src/util/d3d12_descriptor_heap_manager.h index 6332f64f2..e94fc6d31 100644 --- a/src/util/d3d12_descriptor_heap_manager.h +++ b/src/util/d3d12_descriptor_heap_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d12_device.cpp b/src/util/d3d12_device.cpp index b911d58fa..37498b399 100644 --- a/src/util/d3d12_device.cpp +++ b/src/util/d3d12_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_device.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_device.h b/src/util/d3d12_device.h index c411b3b69..59f9977f6 100644 --- a/src/util/d3d12_device.h +++ b/src/util/d3d12_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d12_pipeline.cpp b/src/util/d3d12_pipeline.cpp index 0cfe8f8be..3bc3c0a56 100644 --- a/src/util/d3d12_pipeline.cpp +++ b/src/util/d3d12_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_pipeline.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_pipeline.h b/src/util/d3d12_pipeline.h index 603f8b97b..de79ef11e 100644 --- a/src/util/d3d12_pipeline.h +++ b/src/util/d3d12_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_device.h" diff --git a/src/util/d3d12_stream_buffer.cpp b/src/util/d3d12_stream_buffer.cpp index e74960b12..dc8ea1679 100644 --- a/src/util/d3d12_stream_buffer.cpp +++ b/src/util/d3d12_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_stream_buffer.h" #include "d3d12_device.h" diff --git a/src/util/d3d12_stream_buffer.h b/src/util/d3d12_stream_buffer.h index 1dc4b0c00..80137bb8f 100644 --- a/src/util/d3d12_stream_buffer.h +++ b/src/util/d3d12_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d12_texture.cpp b/src/util/d3d12_texture.cpp index 226a855fa..44e468c6d 100644 --- a/src/util/d3d12_texture.cpp +++ b/src/util/d3d12_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d12_texture.h" #include "d3d12_builders.h" diff --git a/src/util/d3d12_texture.h b/src/util/d3d12_texture.h index 760c66e93..74d8c17a3 100644 --- a/src/util/d3d12_texture.h +++ b/src/util/d3d12_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/d3d_common.cpp b/src/util/d3d_common.cpp index bfa7b393f..318a7a8fa 100644 --- a/src/util/d3d_common.cpp +++ b/src/util/d3d_common.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "d3d_common.h" #include "gpu_device.h" diff --git a/src/util/d3d_common.h b/src/util/d3d_common.h index 3b2636e9c..e017427ee 100644 --- a/src/util/d3d_common.h +++ b/src/util/d3d_common.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/dinput_source.cpp b/src/util/dinput_source.cpp index 960caf591..90245bfdd 100644 --- a/src/util/dinput_source.cpp +++ b/src/util/dinput_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #define INITGUID diff --git a/src/util/dinput_source.h b/src/util/dinput_source.h index 0cf5f582f..a0c2a9c32 100644 --- a/src/util/dinput_source.h +++ b/src/util/dinput_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #define DIRECTINPUT_VERSION 0x0800 diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp index 3ab012051..44e91ce2f 100644 --- a/src/util/gpu_device.cpp +++ b/src/util/gpu_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_device.h" #include "compress_helpers.h" diff --git a/src/util/gpu_device.h b/src/util/gpu_device.h index d4759e97d..f9800b79d 100644 --- a/src/util/gpu_device.h +++ b/src/util/gpu_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/gpu_framebuffer_manager.h b/src/util/gpu_framebuffer_manager.h index b90810c81..9c2fc4070 100644 --- a/src/util/gpu_framebuffer_manager.h +++ b/src/util/gpu_framebuffer_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/gpu_shader_cache.cpp b/src/util/gpu_shader_cache.cpp index 5e7e1cf1a..f8865f8b6 100644 --- a/src/util/gpu_shader_cache.cpp +++ b/src/util/gpu_shader_cache.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_shader_cache.h" #include "gpu_device.h" diff --git a/src/util/gpu_shader_cache.h b/src/util/gpu_shader_cache.h index 4b7ea683e..1b6fef49c 100644 --- a/src/util/gpu_shader_cache.h +++ b/src/util/gpu_shader_cache.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/gpu_texture.cpp b/src/util/gpu_texture.cpp index 64ec92cb9..874590b93 100644 --- a/src/util/gpu_texture.cpp +++ b/src/util/gpu_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_texture.h" #include "gpu_device.h" diff --git a/src/util/gpu_texture.h b/src/util/gpu_texture.h index 3af1196bb..77880bc68 100644 --- a/src/util/gpu_texture.h +++ b/src/util/gpu_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/host.cpp b/src/util/host.cpp index 735927236..d56977c72 100644 --- a/src/util/host.cpp +++ b/src/util/host.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "host.h" diff --git a/src/util/host.h b/src/util/host.h index 3af97fe8d..3577e589c 100644 --- a/src/util/host.h +++ b/src/util/host.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/http_downloader.cpp b/src/util/http_downloader.cpp index 7e2e8903b..b29bbbee5 100644 --- a/src/util/http_downloader.cpp +++ b/src/util/http_downloader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "http_downloader.h" diff --git a/src/util/http_downloader.h b/src/util/http_downloader.h index 6302641e6..0ad730c25 100644 --- a/src/util/http_downloader.h +++ b/src/util/http_downloader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/http_downloader_curl.cpp b/src/util/http_downloader_curl.cpp index 473e543e8..bd902cc93 100644 --- a/src/util/http_downloader_curl.cpp +++ b/src/util/http_downloader_curl.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "http_downloader_curl.h" diff --git a/src/util/http_downloader_curl.h b/src/util/http_downloader_curl.h index 7b3a80091..16f219523 100644 --- a/src/util/http_downloader_curl.h +++ b/src/util/http_downloader_curl.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "http_downloader.h" diff --git a/src/util/http_downloader_winhttp.cpp b/src/util/http_downloader_winhttp.cpp index c440649dc..178eca368 100644 --- a/src/util/http_downloader_winhttp.cpp +++ b/src/util/http_downloader_winhttp.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "http_downloader_winhttp.h" diff --git a/src/util/http_downloader_winhttp.h b/src/util/http_downloader_winhttp.h index 9f4080947..e1faffc01 100644 --- a/src/util/http_downloader_winhttp.h +++ b/src/util/http_downloader_winhttp.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "http_downloader.h" diff --git a/src/util/image.cpp b/src/util/image.cpp index 60b85a0a5..74cf9bb4d 100644 --- a/src/util/image.cpp +++ b/src/util/image.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "image.h" diff --git a/src/util/image.h b/src/util/image.h index b96bd823e..df9460379 100644 --- a/src/util/image.h +++ b/src/util/image.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/imgui_animated.h b/src/util/imgui_animated.h index 9a2d36d37..c8b605b4e 100644 --- a/src/util/imgui_animated.h +++ b/src/util/imgui_animated.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp index 944d4613c..4117df9ed 100644 --- a/src/util/imgui_fullscreen.cpp +++ b/src/util/imgui_fullscreen.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "imgui_fullscreen.h" #include "gpu_device.h" diff --git a/src/util/imgui_fullscreen.h b/src/util/imgui_fullscreen.h index fce248138..d4f3ac04c 100644 --- a/src/util/imgui_fullscreen.h +++ b/src/util/imgui_fullscreen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/imgui_glyph_ranges.inl b/src/util/imgui_glyph_ranges.inl index 681f11a98..4781df141 100644 --- a/src/util/imgui_glyph_ranges.inl +++ b/src/util/imgui_glyph_ranges.inl @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe06f,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf050,0xf050,0xf05e,0xf05e,0xf062,0xf063,0xf067,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0a0,0xf0a0,0xf0ac,0xf0ad,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0e7,0xf0e7,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf140,0xf140,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf51f,0xf51f,0xf538,0xf538,0xf545,0xf545,0xf547,0xf548,0xf57a,0xf57a,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; diff --git a/src/util/imgui_manager.cpp b/src/util/imgui_manager.cpp index 135d547f8..cc10aec4d 100644 --- a/src/util/imgui_manager.cpp +++ b/src/util/imgui_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "imgui_manager.h" #include "gpu_device.h" diff --git a/src/util/imgui_manager.h b/src/util/imgui_manager.h index 76d7fa712..48d345cab 100644 --- a/src/util/imgui_manager.h +++ b/src/util/imgui_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/ini_settings_interface.cpp b/src/util/ini_settings_interface.cpp index 6e3b1c8ac..2ff0cb737 100644 --- a/src/util/ini_settings_interface.cpp +++ b/src/util/ini_settings_interface.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "ini_settings_interface.h" diff --git a/src/util/ini_settings_interface.h b/src/util/ini_settings_interface.h index 8e1c19423..c3ec5a1aa 100644 --- a/src/util/ini_settings_interface.h +++ b/src/util/ini_settings_interface.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/settings_interface.h" diff --git a/src/util/input_manager.cpp b/src/util/input_manager.cpp index e9f90105e..ecfd9d745 100644 --- a/src/util/input_manager.cpp +++ b/src/util/input_manager.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "input_manager.h" #include "common/assert.h" diff --git a/src/util/input_manager.h b/src/util/input_manager.h index b878645ae..1be0ed25f 100644 --- a/src/util/input_manager.h +++ b/src/util/input_manager.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/input_source.cpp b/src/util/input_source.cpp index 4282e17d7..44e151f64 100644 --- a/src/util/input_source.cpp +++ b/src/util/input_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "input_source.h" #include "common/string_util.h" diff --git a/src/util/input_source.h b/src/util/input_source.h index c0c088390..defe05f36 100644 --- a/src/util/input_source.h +++ b/src/util/input_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/iso_reader.cpp b/src/util/iso_reader.cpp index d908bb9f5..223c32d85 100644 --- a/src/util/iso_reader.cpp +++ b/src/util/iso_reader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "iso_reader.h" #include "cd_image.h" diff --git a/src/util/iso_reader.h b/src/util/iso_reader.h index d4162667c..3d0a77af5 100644 --- a/src/util/iso_reader.h +++ b/src/util/iso_reader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/media_capture.cpp b/src/util/media_capture.cpp index ea92e6a51..c70af09ee 100644 --- a/src/util/media_capture.cpp +++ b/src/util/media_capture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "media_capture.h" #include "gpu_device.h" diff --git a/src/util/media_capture.h b/src/util/media_capture.h index 72c4a5ff4..4933ff100 100644 --- a/src/util/media_capture.h +++ b/src/util/media_capture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/metal_device.h b/src/util/metal_device.h index 4738907f4..edf530d46 100644 --- a/src/util/metal_device.h +++ b/src/util/metal_device.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/metal_device.mm b/src/util/metal_device.mm index 63bd7a1bd..3f5278177 100644 --- a/src/util/metal_device.mm +++ b/src/util/metal_device.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "metal_device.h" diff --git a/src/util/metal_layer.h b/src/util/metal_layer.h index b6c745094..b999418dc 100644 --- a/src/util/metal_layer.h +++ b/src/util/metal_layer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 struct WindowInfo; diff --git a/src/util/metal_stream_buffer.h b/src/util/metal_stream_buffer.h index 65ccfa54f..009e1e915 100644 --- a/src/util/metal_stream_buffer.h +++ b/src/util/metal_stream_buffer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/metal_stream_buffer.mm b/src/util/metal_stream_buffer.mm index 453f0a652..0c7804c28 100644 --- a/src/util/metal_stream_buffer.mm +++ b/src/util/metal_stream_buffer.mm @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "metal_stream_buffer.h" #include "metal_device.h" diff --git a/src/util/opengl_context.cpp b/src/util/opengl_context.cpp index c07dc4182..ed4427f7d 100644 --- a/src/util/opengl_context.cpp +++ b/src/util/opengl_context.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context.h" #include "opengl_loader.h" diff --git a/src/util/opengl_context.h b/src/util/opengl_context.h index b18f9e084..10ba56732 100644 --- a/src/util/opengl_context.h +++ b/src/util/opengl_context.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_context_agl.h b/src/util/opengl_context_agl.h index 5b1fbfcd4..899227526 100644 --- a/src/util/opengl_context_agl.h +++ b/src/util/opengl_context_agl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_context_agl.mm b/src/util/opengl_context_agl.mm index 55124919d..15f2c8a33 100644 --- a/src/util/opengl_context_agl.mm +++ b/src/util/opengl_context_agl.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context_agl.h" diff --git a/src/util/opengl_context_egl.cpp b/src/util/opengl_context_egl.cpp index b5d2f206a..b037d7fca 100644 --- a/src/util/opengl_context_egl.cpp +++ b/src/util/opengl_context_egl.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context_egl.h" diff --git a/src/util/opengl_context_egl.h b/src/util/opengl_context_egl.h index 9919cae6d..faca16b36 100644 --- a/src/util/opengl_context_egl.h +++ b/src/util/opengl_context_egl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_context_egl_wayland.cpp b/src/util/opengl_context_egl_wayland.cpp index 4d8228f99..0cd21e2cb 100644 --- a/src/util/opengl_context_egl_wayland.cpp +++ b/src/util/opengl_context_egl_wayland.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context_egl_wayland.h" diff --git a/src/util/opengl_context_egl_wayland.h b/src/util/opengl_context_egl_wayland.h index 73781dd0f..7e17a1cf3 100644 --- a/src/util/opengl_context_egl_wayland.h +++ b/src/util/opengl_context_egl_wayland.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_context_egl_x11.cpp b/src/util/opengl_context_egl_x11.cpp index c3a8269f0..34c18bc6d 100644 --- a/src/util/opengl_context_egl_x11.cpp +++ b/src/util/opengl_context_egl_x11.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context_egl_x11.h" diff --git a/src/util/opengl_context_egl_x11.h b/src/util/opengl_context_egl_x11.h index 5b25f7bac..13e57cb7a 100644 --- a/src/util/opengl_context_egl_x11.h +++ b/src/util/opengl_context_egl_x11.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_context_wgl.cpp b/src/util/opengl_context_wgl.cpp index 070bdf211..a3d0306c8 100644 --- a/src/util/opengl_context_wgl.cpp +++ b/src/util/opengl_context_wgl.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_context_wgl.h" #include "opengl_loader.h" diff --git a/src/util/opengl_context_wgl.h b/src/util/opengl_context_wgl.h index 23d4ff144..c654394e9 100644 --- a/src/util/opengl_context_wgl.h +++ b/src/util/opengl_context_wgl.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_device.cpp b/src/util/opengl_device.cpp index 669d9e1c1..63cbaf292 100644 --- a/src/util/opengl_device.cpp +++ b/src/util/opengl_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_device.h" #include "opengl_pipeline.h" diff --git a/src/util/opengl_device.h b/src/util/opengl_device.h index b90416043..d70bde666 100644 --- a/src/util/opengl_device.h +++ b/src/util/opengl_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_loader.h b/src/util/opengl_loader.h index 1190374a2..5c2b3a875 100644 --- a/src/util/opengl_loader.h +++ b/src/util/opengl_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_pipeline.cpp b/src/util/opengl_pipeline.cpp index 35778aa64..63d0fa898 100644 --- a/src/util/opengl_pipeline.cpp +++ b/src/util/opengl_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_pipeline.h" #include "compress_helpers.h" diff --git a/src/util/opengl_pipeline.h b/src/util/opengl_pipeline.h index c39e5b789..7fdb96541 100644 --- a/src/util/opengl_pipeline.h +++ b/src/util/opengl_pipeline.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_stream_buffer.cpp b/src/util/opengl_stream_buffer.cpp index 7a4fef1e5..9907edcca 100644 --- a/src/util/opengl_stream_buffer.cpp +++ b/src/util/opengl_stream_buffer.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_stream_buffer.h" diff --git a/src/util/opengl_stream_buffer.h b/src/util/opengl_stream_buffer.h index 2fe8f9b7e..b7b3ed960 100644 --- a/src/util/opengl_stream_buffer.h +++ b/src/util/opengl_stream_buffer.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/opengl_texture.cpp b/src/util/opengl_texture.cpp index fbdb6a88d..6b31c0f29 100644 --- a/src/util/opengl_texture.cpp +++ b/src/util/opengl_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "opengl_texture.h" #include "opengl_device.h" diff --git a/src/util/opengl_texture.h b/src/util/opengl_texture.h index 3d0702a65..cb9f80e03 100644 --- a/src/util/opengl_texture.h +++ b/src/util/opengl_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/page_fault_handler.cpp b/src/util/page_fault_handler.cpp index 0cb2d6daa..01348a314 100644 --- a/src/util/page_fault_handler.cpp +++ b/src/util/page_fault_handler.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "page_fault_handler.h" diff --git a/src/util/page_fault_handler.h b/src/util/page_fault_handler.h index 7869ff179..62256e3ab 100644 --- a/src/util/page_fault_handler.h +++ b/src/util/page_fault_handler.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/util/pch.cpp b/src/util/pch.cpp index ef4256aee..5b7d58117 100644 --- a/src/util/pch.cpp +++ b/src/util/pch.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "pch.h" diff --git a/src/util/pch.h b/src/util/pch.h index 022c1bc10..90af4e7ca 100644 --- a/src/util/pch.h +++ b/src/util/pch.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/platform_misc.h b/src/util/platform_misc.h index 13b81d841..18fc06dd7 100644 --- a/src/util/platform_misc.h +++ b/src/util/platform_misc.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "window_info.h" diff --git a/src/util/platform_misc_mac.mm b/src/util/platform_misc_mac.mm index 721eaf39b..6acd1f766 100644 --- a/src/util/platform_misc_mac.mm +++ b/src/util/platform_misc_mac.mm @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Normally, system includes come last. But apparently some of our macro names are redefined... #include diff --git a/src/util/platform_misc_unix.cpp b/src/util/platform_misc_unix.cpp index 2ffbaf42d..d2488c51a 100644 --- a/src/util/platform_misc_unix.cpp +++ b/src/util/platform_misc_unix.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin and contributors. -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "input_manager.h" #include "platform_misc.h" diff --git a/src/util/platform_misc_win32.cpp b/src/util/platform_misc_win32.cpp index 8528e4f17..c81b72f00 100644 --- a/src/util/platform_misc_win32.cpp +++ b/src/util/platform_misc_win32.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "platform_misc.h" diff --git a/src/util/postprocessing.cpp b/src/util/postprocessing.cpp index 52fa184b7..edc686079 100644 --- a/src/util/postprocessing.cpp +++ b/src/util/postprocessing.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "postprocessing.h" #include "gpu_device.h" diff --git a/src/util/postprocessing.h b/src/util/postprocessing.h index 1ab2f5c53..f91d7e504 100644 --- a/src/util/postprocessing.h +++ b/src/util/postprocessing.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/postprocessing_shader.cpp b/src/util/postprocessing_shader.cpp index 21979dd3a..9c732e392 100644 --- a/src/util/postprocessing_shader.cpp +++ b/src/util/postprocessing_shader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "postprocessing_shader.h" diff --git a/src/util/postprocessing_shader.h b/src/util/postprocessing_shader.h index 3c8e30f8b..d0a0150b5 100644 --- a/src/util/postprocessing_shader.h +++ b/src/util/postprocessing_shader.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/postprocessing_shader_fx.cpp b/src/util/postprocessing_shader_fx.cpp index a76c32c15..fa7887ff8 100644 --- a/src/util/postprocessing_shader_fx.cpp +++ b/src/util/postprocessing_shader_fx.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "postprocessing_shader_fx.h" #include "image.h" diff --git a/src/util/postprocessing_shader_fx.h b/src/util/postprocessing_shader_fx.h index 259352a50..af3909ff4 100644 --- a/src/util/postprocessing_shader_fx.h +++ b/src/util/postprocessing_shader_fx.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/postprocessing_shader_glsl.cpp b/src/util/postprocessing_shader_glsl.cpp index d2eb321c1..51d45ca80 100644 --- a/src/util/postprocessing_shader_glsl.cpp +++ b/src/util/postprocessing_shader_glsl.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "postprocessing_shader_glsl.h" #include "shadergen.h" diff --git a/src/util/postprocessing_shader_glsl.h b/src/util/postprocessing_shader_glsl.h index 1dd5f4126..b1714ee3a 100644 --- a/src/util/postprocessing_shader_glsl.h +++ b/src/util/postprocessing_shader_glsl.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/sdl_audio_stream.cpp b/src/util/sdl_audio_stream.cpp index 3fbd3623a..73c2515bb 100644 --- a/src/util/sdl_audio_stream.cpp +++ b/src/util/sdl_audio_stream.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "audio_stream.h" diff --git a/src/util/sdl_input_source.cpp b/src/util/sdl_input_source.cpp index 4053aeb5f..a27d8b958 100644 --- a/src/util/sdl_input_source.cpp +++ b/src/util/sdl_input_source.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "sdl_input_source.h" #include "input_manager.h" diff --git a/src/util/sdl_input_source.h b/src/util/sdl_input_source.h index 14e0a2349..f3367caea 100644 --- a/src/util/sdl_input_source.h +++ b/src/util/sdl_input_source.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "input_source.h" diff --git a/src/util/shadergen.cpp b/src/util/shadergen.cpp index 517c637fb..840d924e5 100644 --- a/src/util/shadergen.cpp +++ b/src/util/shadergen.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "shadergen.h" diff --git a/src/util/shadergen.h b/src/util/shadergen.h index bc92cc935..ec2797128 100644 --- a/src/util/shadergen.h +++ b/src/util/shadergen.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/sockets.cpp b/src/util/sockets.cpp index 15f9ae6f4..4e2554e0d 100644 --- a/src/util/sockets.cpp +++ b/src/util/sockets.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2015-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "sockets.h" #include "platform_misc.h" diff --git a/src/util/sockets.h b/src/util/sockets.h index ac0e58a34..7d40edc9c 100644 --- a/src/util/sockets.h +++ b/src/util/sockets.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2015-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/state_wrapper.cpp b/src/util/state_wrapper.cpp index 4d609ae90..96781f666 100644 --- a/src/util/state_wrapper.cpp +++ b/src/util/state_wrapper.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "state_wrapper.h" #include "common/log.h" diff --git a/src/util/state_wrapper.h b/src/util/state_wrapper.h index 971a94ebc..6f46b6871 100644 --- a/src/util/state_wrapper.h +++ b/src/util/state_wrapper.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_builders.cpp b/src/util/vulkan_builders.cpp index 225fe5cda..4b61fb722 100644 --- a/src/util/vulkan_builders.cpp +++ b/src/util/vulkan_builders.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_builders.h" diff --git a/src/util/vulkan_builders.h b/src/util/vulkan_builders.h index 0038859f5..dab39ec32 100644 --- a/src/util/vulkan_builders.h +++ b/src/util/vulkan_builders.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_device.cpp b/src/util/vulkan_device.cpp index 810dc3071..1371a147c 100644 --- a/src/util/vulkan_device.cpp +++ b/src/util/vulkan_device.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_device.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_device.h b/src/util/vulkan_device.h index 994efb530..6a959e70d 100644 --- a/src/util/vulkan_device.h +++ b/src/util/vulkan_device.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_entry_points.h b/src/util/vulkan_entry_points.h index 69cf5ca4c..114f53304 100644 --- a/src/util/vulkan_entry_points.h +++ b/src/util/vulkan_entry_points.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_entry_points.inl b/src/util/vulkan_entry_points.inl index d313d91ed..693382873 100644 --- a/src/util/vulkan_entry_points.inl +++ b/src/util/vulkan_entry_points.inl @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // Expands the VULKAN_ENTRY_POINT macro for each function when this file is included. // Parameters: Function name, is required diff --git a/src/util/vulkan_loader.cpp b/src/util/vulkan_loader.cpp index 8089ffd8a..99c31e49d 100644 --- a/src/util/vulkan_loader.cpp +++ b/src/util/vulkan_loader.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 // No better place for this.. #define VMA_IMPLEMENTATION diff --git a/src/util/vulkan_loader.h b/src/util/vulkan_loader.h index ca3f91679..c81816657 100644 --- a/src/util/vulkan_loader.h +++ b/src/util/vulkan_loader.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_pipeline.cpp b/src/util/vulkan_pipeline.cpp index cda46ecc8..0029104e5 100644 --- a/src/util/vulkan_pipeline.cpp +++ b/src/util/vulkan_pipeline.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_pipeline.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_pipeline.h b/src/util/vulkan_pipeline.h index d77b5637f..89468f0d4 100644 --- a/src/util/vulkan_pipeline.h +++ b/src/util/vulkan_pipeline.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "gpu_device.h" #include "vulkan_loader.h" diff --git a/src/util/vulkan_stream_buffer.cpp b/src/util/vulkan_stream_buffer.cpp index e2baa875f..cf200da11 100644 --- a/src/util/vulkan_stream_buffer.cpp +++ b/src/util/vulkan_stream_buffer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_stream_buffer.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_stream_buffer.h b/src/util/vulkan_stream_buffer.h index b0ebe9f69..b03c6bb1d 100644 --- a/src/util/vulkan_stream_buffer.h +++ b/src/util/vulkan_stream_buffer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_swap_chain.cpp b/src/util/vulkan_swap_chain.cpp index 3b637a269..4607fdc47 100644 --- a/src/util/vulkan_swap_chain.cpp +++ b/src/util/vulkan_swap_chain.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_swap_chain.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_swap_chain.h b/src/util/vulkan_swap_chain.h index 7763613fe..f0c0d0b07 100644 --- a/src/util/vulkan_swap_chain.h +++ b/src/util/vulkan_swap_chain.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/vulkan_texture.cpp b/src/util/vulkan_texture.cpp index 42eaf9b56..f32f6ffba 100644 --- a/src/util/vulkan_texture.cpp +++ b/src/util/vulkan_texture.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "vulkan_texture.h" #include "vulkan_builders.h" diff --git a/src/util/vulkan_texture.h b/src/util/vulkan_texture.h index 9679d88ba..e877ae5bf 100644 --- a/src/util/vulkan_texture.h +++ b/src/util/vulkan_texture.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/wav_writer.cpp b/src/util/wav_writer.cpp index 998177236..c6bd46aa7 100644 --- a/src/util/wav_writer.cpp +++ b/src/util/wav_writer.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "wav_writer.h" #include "common/file_system.h" diff --git a/src/util/wav_writer.h b/src/util/wav_writer.h index 3d3871dc6..669899108 100644 --- a/src/util/wav_writer.h +++ b/src/util/wav_writer.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/types.h" diff --git a/src/util/win32_raw_input_source.cpp b/src/util/win32_raw_input_source.cpp index 0194fc27b..8b93fd2ad 100644 --- a/src/util/win32_raw_input_source.cpp +++ b/src/util/win32_raw_input_source.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "win32_raw_input_source.h" #include "common/assert.h" diff --git a/src/util/win32_raw_input_source.h b/src/util/win32_raw_input_source.h index 1f65b8ee7..5c5738e39 100644 --- a/src/util/win32_raw_input_source.h +++ b/src/util/win32_raw_input_source.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/windows_headers.h" diff --git a/src/util/window_info.cpp b/src/util/window_info.cpp index fd66516cd..553dae8d3 100644 --- a/src/util/window_info.cpp +++ b/src/util/window_info.cpp @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "window_info.h" diff --git a/src/util/window_info.h b/src/util/window_info.h index 4c9be3184..0bd76c296 100644 --- a/src/util/window_info.h +++ b/src/util/window_info.h @@ -1,5 +1,5 @@ // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once diff --git a/src/util/xinput_source.cpp b/src/util/xinput_source.cpp index 08f03343f..aa86639c9 100644 --- a/src/util/xinput_source.cpp +++ b/src/util/xinput_source.cpp @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #include "xinput_source.h" #include "input_manager.h" diff --git a/src/util/xinput_source.h b/src/util/xinput_source.h index c51d907fb..3258e7e67 100644 --- a/src/util/xinput_source.h +++ b/src/util/xinput_source.h @@ -1,5 +1,5 @@ -// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin -// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) +// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +// SPDX-License-Identifier: PolyForm-Strict-1.0.0 #pragma once #include "common/windows_headers.h"