fly/flightgear
1
0
Fork 0
Code Activity

Simplify logic now SGPath::desktop works on Windows.

Browse source
This commit is contained in:
James Turner 2013-06-20 00:03:36 +01:00
parent 470a551176
commit b7bf3ee620
1 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Main/fg_init.cxx
View file

@ -367,35 +367,7 @@ static SGPath platformDefaultDataPath()
return config;
}
SGPath platformDesktopPath()
{
/*
typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
static GetSpecialFolderPath SHGetSpecialFolderPath = NULL;
// lazy open+resolve of shell32
if (!SHGetSpecialFolderPath) {
HINSTANCE shellDll = ::LoadLibrary("shell32");
SHGetSpecialFolderPath = (GetSpecialFolderPath) GetProcAddress(shellDll, "SHGetSpecialFolderPathA");
}
if (!SHGetSpecialFolderPath)
return SGPath();
char path[PATH_MAX];
if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, false)) {
return SGPath(path);
}
// failed, bad
return SGPath();
*/
// TODO real implementation and move to SGPath
return SGPath(fgGetString("/sim/fg-current"));
}
#else
#ifdef __APPLE__
#elif __APPLE__
#include <CoreServices/CoreServices.h>
static SGPath platformDefaultDataPath()
@ -422,11 +394,6 @@ static SGPath platformDefaultDataPath()
return SGPath::home() / ".fgfs";
}
#endif
SGPath platformDesktopPath()
{
return SGPath::desktop();
}
#endif
void fgInitHome()
{