From 0d0923eab8ea26b46ae0e12804eae8c0b7a6c246 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 25 Jan 2016 05:38:52 +1100 Subject: [PATCH] [Glide64] Make config _WIN32 only --- Source/Glide64/Config.cpp | 26 +++++++------------------- Source/Glide64/Config.h | 16 +++++----------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp index 4fcc9d7a3..d74eaf1cd 100644 --- a/Source/Glide64/Config.cpp +++ b/Source/Glide64/Config.cpp @@ -47,6 +47,8 @@ #include "Gfx_1.3.h" #include "DepthBufferRender.h" #include "Config.h" + +#ifdef _WIN32 #include #include // begin wxGlade: ::extracode @@ -1260,28 +1262,14 @@ void CALL DllAbout(HWND hParent) hostWindow = NULL; #endif } +#endif void general_setting(short setting_ID, const char * name, unsigned int value) { - RegisterSetting( - setting_ID, - Data_DWORD_General, - name, - NULL, - value, - NULL - ); - return; + RegisterSetting(setting_ID, Data_DWORD_General, name, NULL, value, NULL); } + void game_setting(short setting_ID, const char * name, unsigned int value) { - RegisterSetting( - setting_ID, - Data_DWORD_Game, - name, - NULL, - value, - NULL - ); - return; -} \ No newline at end of file + RegisterSetting(setting_ID, Data_DWORD_Game, name, NULL, value, NULL); +} diff --git a/Source/Glide64/Config.h b/Source/Glide64/Config.h index f7d6b6639..d7b9d26ea 100644 --- a/Source/Glide64/Config.h +++ b/Source/Glide64/Config.h @@ -43,7 +43,9 @@ //**************************************************************** // -*- C++ -*- generated by wxGlade 0.6.3 on Wed Oct 08 18:56:23 2008 +#pragma once +#ifdef _WIN32 #include #include // begin wxGlade: ::dependencies @@ -51,11 +53,6 @@ #include // end wxGlade - -#ifndef CONFIG_H -#define CONFIG_H - - // begin wxGlade: ::extracode // end wxGlade @@ -255,6 +252,7 @@ protected: wxButton* button_ok; // end wxGlade }; // wxGlade: end class +#endif enum { // General Settings @@ -286,9 +284,5 @@ enum { extern short Set_basic_mode, Set_texture_dir; -extern void - general_setting(short setting_ID, const char * name, unsigned int value); -extern void - game_setting(short setting_ID, const char * name, unsigned int value); - -#endif // CONFIG_H +extern void general_setting(short setting_ID, const char * name, unsigned int value); +extern void game_setting(short setting_ID, const char * name, unsigned int value);