comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MSVC resource patch from @guruofquality #276

This commit is contained in:
Charles J. Cliffe 2016-02-22 18:43:58 -05:00
parent 549b03bdc3
commit eb020a765b
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/GLFont.cpp
View File

@ -4,6 +4,25 @@
#include <fstream>
#include <algorithm>
#ifdef _MSC_VER
#include <windows.h>
static std::string getExePath(void)
{
HMODULE hModule = GetModuleHandle(NULL);
char path[MAX_PATH];
GetModuleFileNameA(hModule, path, MAX_PATH);
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char fname[_MAX_FNAME];
char ext[_MAX_EXT];
_splitpath_s(path, drive, dir, fname, ext);
return std::string(drive) + std::string(dir);
}
#endif
#ifndef RES_FOLDER
#define RES_FOLDER ""
#endif
@ -158,6 +177,9 @@ std::string GLFont::getParamValue(std::string param_str) {
void GLFont::loadFont(std::string fontFile) {
std::string resourceFolder = RES_FOLDER;
#ifdef _MSC_VER
resourceFolder = getExePath() + "/" + resourceFolder;
#endif
wxFileName fontFileName = wxFileName(resourceFolder, fontFile);