From e3213b14ee1a0b599997069395ae3feabd50ec4e Mon Sep 17 00:00:00 2001 From: driver1998 Date: Sun, 5 May 2019 01:15:32 +0800 Subject: [PATCH] Remove unnecessary ifdefs --- Windows/MainWindowMenu.cpp | 4 ---- Windows/main.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index b21b6dc5fc..bf869c6823 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -1173,14 +1173,10 @@ namespace MainWindow { CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel) ? MF_CHECKED : MF_UNCHECKED)); } -#if !defined(_M_ARM64) && !defined(_M_ARM) if (g_Config.iGPUBackend == (int)GPUBackend::OPENGL && !gl_extensions.OES_texture_npot) { EnableMenuItem(menu, ID_TEXTURESCALING_3X, MF_GRAYED); EnableMenuItem(menu, ID_TEXTURESCALING_5X, MF_GRAYED); } else { -#else - { -#endif EnableMenuItem(menu, ID_TEXTURESCALING_3X, MF_ENABLED); EnableMenuItem(menu, ID_TEXTURESCALING_5X, MF_ENABLED); } diff --git a/Windows/main.h b/Windows/main.h index f19e34b33c..9018b41bc8 100644 --- a/Windows/main.h +++ b/Windows/main.h @@ -27,7 +27,7 @@ extern CDisasm *disasmWindow[MAX_CPUCOUNT]; extern CMemoryDlg *memoryWindow[MAX_CPUCOUNT]; -#ifndef _M_ARM64 +#if !defined(_M_ARM64) && !defined(_M_ARM) #include "Windows/GEDebugger/GEDebugger.h" extern CGEDebugger* geDebuggerWindow; #endif