OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Fixes for Linux compilation of plFontConverter

Browse Source
This commit is contained in:
Michael Hansen
2014-04-13 18:12:24 -07:00
parent d4465a2168
commit c78137c743
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -46,11 +46,11 @@ find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the clie
find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client
find_package(CURL REQUIRED)
find_package(Freetype)
if(WIN32)
find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client
find_package(DirectX REQUIRED)
find_package(Freetype)
endif(WIN32)
find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built...

6
Sources/Tools/plFontConverter/plFontConverter.cpp
View File

@ -79,10 +79,6 @@ REGISTER_CREATABLE(plMipmap);
#include <functional>
HINSTANCE gInstance;
char *gCommandLine = nil;
HWND gMainWindow = nil;
static void IAboutDialog(QWidget *parent)
{
QDialog dlg(parent);
@ -379,6 +375,7 @@ void plFontConverter::IImportBDF(const plFileName &path)
IUpdateInfo();
}
#ifdef Q_OS_WIN
struct ResRecord
{
HRSRC fHandle;
@ -414,6 +411,7 @@ static ResRecord DoSelectResource(const QList<ResRecord> &resources)
return ResRecord();
}
#endif
void plFontConverter::IImportFON(const plFileName &path)
{