327982c190
* 1. Fix to build angleproject using newest git checkout by linking to -lsetupapi 2. Add small patch to build outside of the source directory 3. Build static libraries after building shared libraries * Update PKGBUILD * Update PKGBUILD * 1. modify spacing to be consistent * Update PKGBUILD * 1. windows file endings broke build * # Conflicts: # mingw-w64-angleproject-git/PKGBUILD * 462820ab00f0644c96f0d56925f89eca3a1fbf8bc2e033e13c41b971980b2a56 * 1. fix 32bit definitions * Update NSS to 3.20.2
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
diff --git a/include/export.h b/include/export.h
|
|
index cf144f92a5..892e10d2dd 100644
|
|
--- a/include/export.h
|
|
+++ b/include/export.h
|
|
@@ -10,14 +10,14 @@
|
|
#define LIBGLESV2_EXPORT_H_
|
|
|
|
#if !defined(ANGLE_EXPORT)
|
|
-#if defined(_WIN32)
|
|
+#if defined(_WIN32) && !defined(ANGLE_STATIC)
|
|
#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
|
|
defined(LIBANGLE_UTIL_IMPLEMENTATION)
|
|
# define ANGLE_EXPORT __declspec(dllexport)
|
|
# else
|
|
# define ANGLE_EXPORT __declspec(dllimport)
|
|
# endif
|
|
-#elif defined(__GNUC__)
|
|
+#elif defined(__GNUC__) && !defined(ANGLE_STATIC)
|
|
#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
|
|
defined(LIBANGLE_UTIL_IMPLEMENTATION)
|
|
# define ANGLE_EXPORT __attribute__((visibility ("default")))
|
|
diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h
|
|
index 68fca48271..bc5b299a97 100755
|
|
--- a/include/KHR/khrplatform.h
|
|
+++ b/include/KHR/khrplatform.h
|
|
@@ -97,9 +97,9 @@
|
|
*-------------------------------------------------------------------------
|
|
* This precedes the return type of the function in the function prototype.
|
|
*/
|
|
-#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
|
|
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(ANGLE_STATIC)
|
|
# define KHRONOS_APICALL __declspec(dllimport)
|
|
-#elif defined (__SYMBIAN32__)
|
|
+#elif defined (__SYMBIAN32__) && !defined(ANGLE_STATIC)
|
|
# define KHRONOS_APICALL IMPORT_C
|
|
#elif defined(__ANDROID__)
|
|
# include <sys/cdefs.h>
|