projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
35e0dbf
)
Fix OS X build.
author
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 13:55:30 +0000
(14:55 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 13:55:30 +0000
(14:55 +0100)
src/tools/dcpomatic_server.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index d876832800153abb4db97fa5580fbffbb664ac50..b45e579410845ced5fb438dc18c0be8062aaa498 100644
(file)
--- a/
src/tools/dcpomatic_server.cc
+++ b/
src/tools/dcpomatic_server.cc
@@
-26,6
+26,7
@@
#include "lib/log.h"
#include "lib/raw_convert.h"
#include "lib/signaller.h"
#include "lib/log.h"
#include "lib/raw_convert.h"
#include "lib/signaller.h"
+#include "lib/cross.h"
#include <wx/taskbar.h>
#include <wx/icon.h>
#include <boost/thread.hpp>
#include <wx/taskbar.h>
#include <wx/icon.h>
#include <boost/thread.hpp>
@@
-209,7
+210,7
@@
public:
wxIcon icon (std_to_wx ("taskbar_icon"));
#else
wxInitAllImageHandlers();
wxIcon icon (std_to_wx ("taskbar_icon"));
#else
wxInitAllImageHandlers();
- wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"),
LINUX_SHARE_PREFIX
), wxBITMAP_TYPE_PNG);
+ wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"),
std_to_wx (shared_path().string())
), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif