diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index c7b05a425..7ae655873 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -1075,57 +1075,8 @@ void ReleaseGfx() rdp.window_changed = TRUE; } -// -// DllMain - called when the DLL is loaded, use this to get the DLL's instance -// -class wxDLLApp : public wxApp -{ -public: - virtual bool OnInit(); - virtual void CleanUp(); -}; - -IMPLEMENT_APP_NO_MAIN(wxDLLApp) - -bool wxDLLApp::OnInit() -{ - wxImage::AddHandler(new wxPNGHandler); - wxImage::AddHandler(new wxJPEGHandler); - return true; -} - -void wxDLLApp::CleanUp() -{ - wxApp::CleanUp(); -} - -#ifndef __WINDOWS__ -int __attribute__((constructor)) DllLoad(void); -int __attribute__((destructor)) DllUnload(void); -#endif - -// Called when the library is loaded and before dlopen() returns -int DllLoad(void) -{ - int argc = 0; - char **argv = NULL; - wxEntryStart(argc, argv); - if (wxTheApp) - return wxTheApp->CallOnInit() ? TRUE : FALSE; - return 0; -} - -// Called when the library is unloaded and before dlclose() returns -int DllUnload(void) -{ - if (wxTheApp) - wxTheApp->OnExit(); - wxEntryCleanup(); - return TRUE; -} #ifdef _WIN32 -void wxSetInstance(HINSTANCE hInstance); CriticalSection * g_ProcessDListCS = NULL; extern "C" int WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID /*lpReserved*/) @@ -1139,8 +1090,6 @@ extern "C" int WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID /*lpReser g_ProcessDListCS = new CriticalSection(); } ConfigInit(hinst); - wxSetInstance(hinstDLL); - return DllLoad(); } else if (fdwReason == DLL_PROCESS_DETACH) { @@ -1149,7 +1098,6 @@ extern "C" int WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID /*lpReser delete g_ProcessDListCS; } ConfigCleanup(); - return DllUnload(); } return TRUE; } diff --git a/Source/Glide64/resource.h b/Source/Glide64/resource.h index 37772530e..d50c89f2e 100644 --- a/Source/Glide64/resource.h +++ b/Source/Glide64/resource.h @@ -2,7 +2,73 @@ // Microsoft Visual C++ generated include file. // Used by Glide64.rc // +#define IDD_CONFIG_BASIC 101 +#define IDD_EMULATION_SETTINGS 102 +#define IDD_TEXTURE_ENHANCEMENT 103 +#define IDD_ABOUT 104 #define IDD_ABOUTBOX 104 +#define IDC_CMB_FS_RESOLUTION 1001 +#define IDC_CHK_VERTICAL_SYNC 1002 +#define IDC_CMB_WINDOW_RES 1003 +#define IDC_CBXANISOTROPIC 1004 +#define IDC_CHECK3 1005 +#define IDC_CHK_AUTODETECT_VRAM 1005 +#define IDC_SPIN1 1006 +#define IDC_SPIN_TEXTURE_CACHE 1006 +#define IDC_EDIT1 1007 +#define IDC_CHK_USE_FRAME_BUFFER_OBJECT 1008 +#define IDC_CHK_FPS_COUNTER 1009 +#define IDC_CHK_VIS_COUNTER 1010 +#define IDC_CHK_PERCENT_COUNTER 1011 +#define IDC_CHK_CLOCK_ENABLED 1012 +#define IDC_CHK_CLOCK_24 1013 +#define IDC_CHK_TRANSPARENT 1014 +#define IDC_CMB_SCREEN_SHOT_FORMAT 1015 +#define IDC_CHK_SHOW_TEXTURE_ENHANCEMENT 1016 +#define IDC_INFO 1017 +#define IDC_CMB_FILTERING_MODE 1018 +#define IDC_CMB_BUFFER_SWAPPING 1019 +#define IDC_CMB_LOD_CALC 1020 +#define IDC_CMB_ASPECT_RATIO 1021 +#define IDC_CHK_FOG 1022 +#define IDC_CHK_BUFFER_CLEAR 1023 +#define IDC_TXT_FILTERING_MODE 1024 +#define IDC_CHK_FRAME_BUFFER_EMULATION 1025 +#define IDC_CHK_HARDWARE_FRAMEBUFFER 1026 +#define IDC_CHK_READ_EVERY_FRAME 1027 +#define IDC_CHK_GET_FRAMEBUFFER 1028 +#define IDC_RENDER_FRAME_AS_TEXTURE 1029 +#define IDC_CHK_DETECT_CPU_WRITE 1030 +#define IDC_SOFTWARE_DEPTH_BUFFER 1031 +#define IDC_TXT_BUFFER_SWAPPING 1032 +#define IDC_TXT_LOD_CALC 1033 +#define IDC_TXT_ASPECT_RATIO 1034 +#define IDC_CHK_SOFTWARE_DEPTH_BUFFER 1035 +#define IDC_CMB_ENH_FILTER 1036 +#define IDC_CMB_ENHANCEMENT 1053 +#define IDC_CHK_IGNORE_BACKGROUND 1056 +#define IDC_CHK_ALT_CRC 1057 +#define IDC_CMB_FORMAT_CHOICES 1058 +#define IDC_CHK_TEX_DUMP_EDIT 1059 +#define IDC_CHK_USE_ALPHA_FULLY 1060 +#define IDC_CHK_COMPRESS_CACHE 1061 +#define IDC_CHK_HRS_COMPRESS_CACHE 1062 +#define IDC_CHK_HIRES_TEX_COMPRESSION 1063 +#define IDC_CHK_FORCE_16BPP_TEXT 1064 +#define IDC_CHK_TILE_TEX 1065 +#define IDC_CMB_TEX_COMPRESS_MEHTOD 1066 +#define IDC_CHK_TEX_CACHE_HD 1067 +#define IDC_BUTTON1 1068 +#define IDC_BUTTON2 1069 +#define IDC_TXT_ENH_FILTER 1070 +#define IDC_TXT_ENHANCEMENT 1071 +#define IDC_CHK_TEX_COMPRESSION 1072 +#define IDC_TXT_FORMAT_CHOICES 1073 +#define IDC_SPIN_VRAM_SIZE 1074 +#define IDC_TXT_VRAM_SIZE 1075 +#define IDC_LBL_MB 1076 +#define IDC_TEXT_MB 1077 +#define IDC_TXT_TEXTURE_CACHE 1078 // Next default values for new objects // @@ -10,7 +76,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_CONTROL_VALUE 1079 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif