Commit 58d2dcae by Maarten L. Hekkelman

fix weak linking in Linux (when resources are not available)

parent a9468d1c
...@@ -834,6 +834,11 @@ extern "C" const char gResourceName[]; ...@@ -834,6 +834,11 @@ extern "C" const char gResourceName[];
extern const __attribute__((weak)) mrsrc::rsrc_imp gResourceIndex[]; extern const __attribute__((weak)) mrsrc::rsrc_imp gResourceIndex[];
extern const __attribute__((weak)) char gResourceData[]; extern const __attribute__((weak)) char gResourceData[];
extern const __attribute__((weak)) char gResourceName[]; extern const __attribute__((weak)) char gResourceName[];
const mrsrc::rsrc_imp gResourceIndex[1] = {};
const char gResourceData[1] = {};
const char gResourceName[1] = {};
#endif #endif
namespace mrsrc namespace mrsrc
...@@ -862,7 +867,7 @@ class rsrc_data ...@@ -862,7 +867,7 @@ class rsrc_data
private: private:
rsrc_data() rsrc_data()
{ {
if (gResourceIndex and gResourceIndex and gResourceName) if (gResourceIndex and (gResourceIndex[0].m_child > 0 or gResourceIndex[0].m_size > 0) and gResourceIndex and gResourceName)
{ {
m_index = gResourceIndex; m_index = gResourceIndex;
m_data = gResourceData; m_data = gResourceData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment