Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refurbish last merge. Fix compile for standalone and libcwd.

Browse Source
This commit is contained in:
Aleric Inglewood
2012-08-13 19:30:35 +02:00
parent fbb5dced97
commit 169670a58b
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llimage/llpngwrapper.h
View File

@@ -32,7 +32,12 @@
#ifndef LL_LLPNGWRAPPER_H #ifndef LL_LLPNGWRAPPER_H
#define LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H
#ifdef LL_STANDALONE
#include <png.h>
#else
// Workaround for wrongly packaged prebuilt.
#include "libpng15/png.h" #include "libpng15/png.h"
#endif
#include "llimage.h" #include "llimage.h"
class LLPngWrapper class LLPngWrapper

1
indra/llmessage/llares.cpp
View File

@@ -37,6 +37,7 @@
#include "apr_poll.h" #include "apr_poll.h"
#include "llapr.h" #include "llapr.h"
#include "llaprpool.h"
#include "llareslistener.h" #include "llareslistener.h"
#if defined(LL_WINDOWS) #if defined(LL_WINDOWS)

2
indra/plugins/webkit/media_plugin_webkit.cpp
View File

@@ -25,8 +25,8 @@
* $/LicenseInfo$ * $/LicenseInfo$
* @endcond * @endcond
*/ */
#include "llqtwebkit.h"
#include "linden_common.h" #include "linden_common.h"
#include "llqtwebkit.h"
#include "indra_constants.h" // for indra keyboard codes #include "indra_constants.h" // for indra keyboard codes
#include "lltimer.h" #include "lltimer.h"