diff --git a/SConstruct b/SConstruct index 544b1e09..b2475ad3 100644 --- a/SConstruct +++ b/SConstruct @@ -40,7 +40,7 @@ conf = Configure(env) if env['PLATFORM'] == 'win32': conf.env.Append(CPPPATH = [".", "drivers/win/", "drivers/common/", "drivers/", "drivers/win/zlib", "drivers/win/directx"]) conf.env.Append(CPPDEFINES = ["PSS_STYLE=2", "WIN32", "_USE_SHARED_MEMORY_", "NETWORK", "FCEUDEF_DEBUGGER", "NOMINMAX", "NEED_MINGW_HACKS", "_WIN32_IE=0x0600"]) - conf.env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32"]) + conf.env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"]) if env.has_key('DEBUG'): if env['DEBUG']: conf.env.Append(CCFLAGS = " -g") diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index b0061998..f8b90a0b 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -140,7 +140,7 @@ BEGIN END POPUP "&Help" BEGIN - MENUITEM "Help...", 40140 + MENUITEM "Help...", MENU_HELP MENUITEM "&Message Log...", MENU_MSGLOG MENUITEM SEPARATOR MENUITEM "&About...", MENU_ABOUT diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 696b1a41..2a5801a2 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -344,7 +344,7 @@ #define ACCEL_CTRL_SHIFT_S 40135 #define ACCEL_CTRL_N 40136 #define ACCEL_CTRL_C 40138 -#define FCEU_HELP 40140 +#define MENU_HELP 40140 #define MW_ValueLabel2 65423 #define MW_ValueLabel1 65426 #define GUI_BOT_DEBUG 65436 diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 746ae08d..43610d20 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -54,6 +54,8 @@ #include "directories.h" #include "gui.h" +#include + // Extern variables extern FCEUGI *GameInfo; @@ -1116,9 +1118,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) ShowAboutBox(); break; - case FCEU_HELP: + case MENU_HELP: // Help Menu is selected - + //HtmlHelp(GetDesktopWindow(), "drivers/win/fceux.chm::/{7EEBAD0B-2126-4A8A-864F-61D603111A68}.htm", HH_DISPLAY_TOPIC, (DWORD)NULL); + HtmlHelp(GetDesktopWindow(), "C:/fceux.chm::/{7EEBAD0B-2126-4A8A-864F-61D603111A68}.htm", HH_DISPLAY_TOPIC, (DWORD)NULL); break; case MENU_MSGLOG: