mirror of
https://github.com/WinampDesktop/winamp.git
synced 2025-06-18 14:55:46 -04:00
WIN32 macro -> _WIN32
This commit is contained in:
@ -25,7 +25,7 @@ Log_SetChannel(AutoUpdaterDialog);
|
||||
|
||||
// Logic to detect whether we can use the auto updater.
|
||||
// Currently Windows-only, and requires that the channel be defined by the buildbot.
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#if defined(__has_include) && __has_include("scmversion/tag.h")
|
||||
#include "scmversion/tag.h"
|
||||
#ifdef SCM_RELEASE_TAGS
|
||||
@ -444,7 +444,7 @@ void AutoUpdaterDialog::remindMeLaterClicked()
|
||||
done(0);
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
|
||||
bool AutoUpdaterDialog::processUpdate(const QByteArray& update_data)
|
||||
{
|
||||
|
@ -44,7 +44,7 @@ private:
|
||||
bool updateNeeded() const;
|
||||
std::string getCurrentUpdateTag() const;
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
bool processUpdate(const QByteArray& update_data);
|
||||
bool extractUpdater(const QString& zip_path, const QString& destination_path);
|
||||
bool doUpdate(const QString& zip_path, const QString& updater_path, const QString& destination_path);
|
||||
|
@ -359,7 +359,7 @@ void DebuggerWindow::closeEvent(QCloseEvent* event)
|
||||
|
||||
void DebuggerWindow::setupAdditionalUi()
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
QFont fixedFont;
|
||||
fixedFont.setFamily(QStringLiteral("Consolas"));
|
||||
fixedFont.setFixedPitch(true);
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
// For enumerating adapters.
|
||||
#include "frontend-common/vulkan_host_display.h"
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#include "frontend-common/d3d11_host_display.h"
|
||||
#endif
|
||||
|
||||
@ -202,7 +202,7 @@ void DisplaySettingsWidget::populateGPUAdaptersAndResolutions()
|
||||
bool threaded_presentation_supported = false;
|
||||
switch (static_cast<GPURenderer>(m_ui.renderer->currentIndex()))
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
case GPURenderer::HardwareD3D11:
|
||||
aml = FrontendCommon::D3D11HostDisplay::StaticGetAdapterAndModeList();
|
||||
break;
|
||||
|
@ -1626,7 +1626,7 @@ void MainWindow::checkForUpdates(bool display_message)
|
||||
mbox.setTextFormat(Qt::RichText);
|
||||
|
||||
QString message;
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
message =
|
||||
tr("<p>Sorry, you are trying to update a DuckStation version which is not an official GitHub release. To "
|
||||
"prevent incompatibilities, the auto-updater is only enabled on official builds.</p>"
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <QtGui/QWindowStateChangeEvent>
|
||||
#include <cmath>
|
||||
|
||||
#if !defined(WIN32) && !defined(APPLE)
|
||||
#if !defined(_WIN32) && !defined(APPLE)
|
||||
#include <qpa/qplatformnativeinterface.h>
|
||||
#endif
|
||||
|
||||
@ -56,7 +56,7 @@ std::optional<WindowInfo> QtDisplayWidget::getWindowInfo() const
|
||||
WindowInfo wi;
|
||||
|
||||
// Windows and Apple are easy here since there's no display connection.
|
||||
#if defined(WIN32)
|
||||
#if defined(_WIN32)
|
||||
wi.type = WindowInfo::Type::Win32;
|
||||
wi.window_handle = reinterpret_cast<void*>(winId());
|
||||
#elif defined(__APPLE__)
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include <memory>
|
||||
Log_SetChannel(QtHostInterface);
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#include "common/windows_headers.h"
|
||||
#include "frontend-common/d3d11_host_display.h"
|
||||
#include <KnownFolders.h>
|
||||
@ -570,13 +570,13 @@ HostDisplay* QtHostInterface::createHostDisplay()
|
||||
break;
|
||||
|
||||
case GPURenderer::HardwareOpenGL:
|
||||
#ifndef WIN32
|
||||
#ifndef _WIN32
|
||||
default:
|
||||
#endif
|
||||
m_display = std::make_unique<FrontendCommon::OpenGLHostDisplay>();
|
||||
break;
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
case GPURenderer::HardwareD3D11:
|
||||
default:
|
||||
m_display = std::make_unique<FrontendCommon::D3D11HostDisplay>();
|
||||
@ -1616,7 +1616,7 @@ void QtHostInterface::wakeThread()
|
||||
|
||||
static std::string GetFontPath(const char* name)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
PWSTR folder_path;
|
||||
if (FAILED(SHGetKnownFolderPath(FOLDERID_Fonts, 0, nullptr, &folder_path)))
|
||||
return StringUtil::StdStringFromFormat("C:\\Windows\\Fonts\\%s", name);
|
||||
@ -1637,7 +1637,7 @@ void QtHostInterface::setImGuiFont()
|
||||
|
||||
std::string path;
|
||||
const ImWchar* range = nullptr;
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
if (language == "ja")
|
||||
{
|
||||
path = GetFontPath("msgothic.ttc");
|
||||
|
Reference in New Issue
Block a user