asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67242 from akien-mga/cleanup-unused-defines

Browse source 
Cleanup unused defines in platform code
This commit is contained in:
Rémi Verschelde 2022-10-11 12:34:10 +02:00
commit 6ad1a635ee
5 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/unix/thread_posix.cpp
View file

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED) #if defined(UNIX_ENABLED)
#include "thread_posix.h" #include "thread_posix.h"
@ -73,4 +73,4 @@ void init_thread_posix() {
Thread::_set_platform_functions({ .set_name = set_name }); Thread::_set_platform_functions({ .set_name = set_name });
} }
#endif // UNIX_ENABLED || PTHREAD_ENABLED #endif // UNIX_ENABLED

6
platform/macos/joypad_macos.h
View file

@ -31,14 +31,10 @@
#ifndef JOYPAD_MACOS_H #ifndef JOYPAD_MACOS_H
#define JOYPAD_MACOS_H #define JOYPAD_MACOS_H
#ifdef MACOS_10_0_4
#import <IOKit/hidsystem/IOHIDUsageTables.h>
#else
#import <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#endif
#import <ForceFeedback/ForceFeedback.h> #import <ForceFeedback/ForceFeedback.h>
#import <ForceFeedback/ForceFeedbackConstants.h> #import <ForceFeedback/ForceFeedbackConstants.h>
#import <IOKit/hid/IOHIDLib.h> #import <IOKit/hid/IOHIDLib.h>
#import <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#include "core/input/input.h" #include "core/input/input.h"

7
platform/uwp/os_uwp.cpp
View file

@ -826,10 +826,6 @@ OS_UWP::OS_UWP() {
pressrc = 0; pressrc = 0;
old_invalid = true; old_invalid = true;
mouse_mode = MOUSE_MODE_VISIBLE; mouse_mode = MOUSE_MODE_VISIBLE;
#ifdef STDOUT_FILE
stdo = fopen("stdout.txt", "wb");
#endif
gl_context = nullptr; gl_context = nullptr;
display_request = ref new Windows::System::Display::DisplayRequest(); display_request = ref new Windows::System::Display::DisplayRequest();
@ -847,7 +843,4 @@ OS_UWP::OS_UWP() {
} }
OS_UWP::~OS_UWP() { OS_UWP::~OS_UWP() {
#ifdef STDOUT_FILE
fclose(stdo);
#endif
} }

11
platform/windows/os_windows.cpp
View file

@ -1123,15 +1123,7 @@ Error OS_Windows::move_to_trash(const String &p_path) {
} }
OS_Windows::OS_Windows(HINSTANCE _hInstance) { OS_Windows::OS_Windows(HINSTANCE _hInstance) {
ticks_per_second = 0;
ticks_start = 0;
main_loop = nullptr;
process_map = nullptr;
hInstance = _hInstance; hInstance = _hInstance;
#ifdef STDOUT_FILE
stdo = fopen("stdout.txt", "wb");
#endif
#ifdef WASAPI_ENABLED #ifdef WASAPI_ENABLED
AudioDriverManager::add_driver(&driver_wasapi); AudioDriverManager::add_driver(&driver_wasapi);
@ -1160,7 +1152,4 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
} }
OS_Windows::~OS_Windows() { OS_Windows::~OS_Windows() {
#ifdef STDOUT_FILE
fclose(stdo);
#endif
} }

11
platform/windows/os_windows.h
View file

@ -84,13 +84,10 @@ public:
}; };
class JoypadWindows; class JoypadWindows;
class OS_Windows : public OS {
#ifdef STDOUT_FILE
FILE *stdo = nullptr;
#endif
uint64_t ticks_start; class OS_Windows : public OS {
uint64_t ticks_per_second; uint64_t ticks_start = 0;
uint64_t ticks_per_second = 0;
HINSTANCE hInstance; HINSTANCE hInstance;
MainLoop *main_loop = nullptr; MainLoop *main_loop = nullptr;
@ -130,7 +127,7 @@ protected:
STARTUPINFO si; STARTUPINFO si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
}; };
HashMap<ProcessID, ProcessInfo> *process_map; HashMap<ProcessID, ProcessInfo> *process_map = nullptr;
public: public:
virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override; virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override;