Browse Source

Fixes for Linux compilation of plFontConverter

Michael Hansen 11 years ago
parent
commit
c78137c743
  1. 2
      CMakeLists.txt
  2. 6
      Sources/Tools/plFontConverter/plFontConverter.cpp

2
CMakeLists.txt

@ -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(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(Speex REQUIRED) #TODO: Not required if we aren't building the client
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
find_package(Freetype)
if(WIN32) if(WIN32)
find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client
find_package(DirectX REQUIRED) find_package(DirectX REQUIRED)
find_package(Freetype)
endif(WIN32) endif(WIN32)
find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built... find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built...

6
Sources/Tools/plFontConverter/plFontConverter.cpp

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

Loading…
Cancel
Save