ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixes for Qt windows chm help file loader.

This commit is contained in:
mjbudd77 2021-08-15 21:09:12 -04:00
parent 90d8dbd411
commit f8b6d19a94
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(WIN32)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/drivers/win/zlib )
set( OPENGL_LDFLAGS OpenGL::GL ) set( OPENGL_LDFLAGS OpenGL::GL )
set( SDL2_LDFLAGS ${SDL_INSTALL_PREFIX}/SDL2/lib/x64/SDL2.lib ) set( SDL2_LDFLAGS ${SDL_INSTALL_PREFIX}/SDL2/lib/x64/SDL2.lib )
set( SYS_LIBS wsock32 ws2_32 vfw32 ) set( SYS_LIBS wsock32 ws2_32 vfw32 Htmlhelp )
set(APP_ICON_RESOURCES_WINDOWS ${CMAKE_SOURCE_DIR}/icons/fceux.rc ) set(APP_ICON_RESOURCES_WINDOWS ${CMAKE_SOURCE_DIR}/icons/fceux.rc )
else(WIN32) else(WIN32)
# Non Windows System # Non Windows System

15
src/drivers/Qt/HelpPages.cpp
View File

@ -2,20 +2,29 @@
#include <string> #include <string>
#include "driver.h"
#include "Qt/HelpPages.h" #include "Qt/HelpPages.h"
#include "Qt/ConsoleWindow.h"
#ifdef WIN32 #ifdef WIN32
#include <Windows.h>
#include <htmlhelp.h> #include <htmlhelp.h>
void OpenHelpWindow(std::string subpage) void OpenHelpWindow(std::string subpage)
{ {
std::string helpFileName = BaseDirectory; HWND helpWin;
helpFileName += "\\fceux.chm"; std::string helpFileName = FCEUI_GetBaseDirectory();
helpFileName += "\\..\\doc\\fceux.chm";
if (subpage.length() > 0) if (subpage.length() > 0)
{ {
helpFileName = helpFileName + "::/" + subpage + ".htm"; helpFileName = helpFileName + "::/" + subpage + ".htm";
} }
HtmlHelp(GetDesktopWindow(), helpFileName.c_str(), HH_DISPLAY_TOPIC, (DWORD)NULL); //printf("Looking for HelpFile '%s'\n", helpFileName.c_str() );
helpWin = HtmlHelp( HWND(consoleWindow->winId()), helpFileName.c_str(), HH_DISPLAY_TOPIC, (DWORD)NULL);
if ( helpWin == NULL )
{
printf("Error: Failed to open help file '%s'\n", helpFileName.c_str() );
}
} }
#else #else