Commit Graph

24 Commits

Author SHA1 Message Date
6bc81d4e78 Simplify some $ENABLE_DEBUG expressions
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-08-29 17:14:53 +02:00
445d463a7f Update some external config.{guess,sub}
...to latest versions from <http://git.savannah.gnu.org/gitweb/?p=config.git;
a=blob_plain;f=config.guess;hb=HEAD> and <http://git.savannah.gnu.org/gitweb/?
p=config.git;a=blob_plain;f=config.sub;hb=HEAD>, for aarch64 support.

Change-Id: I99756c33652aa8e19c6a407260b5c49de140128e
2014-08-26 15:59:43 +02:00
7f0e4cf20e Add separate project file for VS2013
Easier than trying to figure out how to make the VC2010 project work
with VS2013, it seems. Luckily it works fine tojust have VS2013
upgrade the old project file and then pass that to msbuild.

Change-Id: I94c0248211767d97f2898f35b1b677aee372a329
2014-07-28 22:07:43 +03:00
f4afc39514 VS2013: Adjust glew to 12.0 vcproj version
Change-Id: Ibfb6f7d23c0f3afbd7ef810093dbbec7f9134aaa
Reviewed-on: https://gerrit.libreoffice.org/10160
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-11 11:35:44 +00:00
3efe9b2954 Handle VCVER==120 (VS 2013) too
Change-Id: I4dbf663790bd8906ef8b123a01bdf52e0c0c1962
2014-07-07 20:52:56 +03:00
09c0a96eb3 externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
2014-05-26 11:39:06 +02:00
f3a46244a0 Make it actually work to build GLEW for debugging
The check in the GLEW Makefile looked at the whole $(MAKECMDGOALS),
which in our case was the string 'glew.lib debug', not just 'debug'.

Change-Id: I639395c944e8f2b443cbb55b451a4036b2c9d3bb
2014-05-20 10:19:18 +03:00
e175eb3ced fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012
VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP

Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
2014-05-19 19:58:54 +02:00
3f69f376fc Stripping confuses the Android NDK tool-chain
Change-Id: I0cf84a6ccb783642a3d50a004325a19b79741b32
2014-04-15 08:38:47 +03:00
76c9cd64e0 Include <Availability.h> to get __IPHONE_OS_VERSION_MIN_REQUIRED
Change-Id: I0ef21ee7709cab05639935d70722973c9a18f93c
2014-04-08 14:45:49 +03:00
d3f63d4b3d No glu.h in OpenGL ES for iOS
Change-Id: Ie0eb1f68d997c4f2bd37c9d7c2ff6feccbc7b8ce
2014-04-08 14:45:49 +03:00
1309c34ac0 We build a static libGLEW for iOS anyway
So no need to bother with what framework(s) to link to.

Change-Id: I7dac64357bc01221787ef7e393952d492e2d84c7
2014-04-08 13:03:42 +03:00
d8ad7d5790 Build GLEW for all platforms
Whether it actually should be used or not on some particular platform
is another thing that remains to be seen. But I think it should be
buildable for all?

Don't build the glew programs for non-desktop platforms.

Build only static libraries when DISABLE_DYNLOADING.

No AGL framework, and it's OpenGLES, not OpenGL, on iOS.

Change-Id: Idf3aad341c4f270952db2039d5a5e421f39e728f
2014-04-08 12:51:54 +03:00
3b3cf0ecae Fix libGLEW build for OS X
Change-Id: I996f88544c4cdedaf8aa047abb1888409b949800
2014-04-08 10:50:08 +03:00
75565d7a17 glew: stop linking to unneeded Xmu, Xi, Xext libraries
Change-Id: I449a08699f0f980a2fe4624363116e6fae2b549c
2014-01-30 12:27:11 +01:00
3fe28da98f Use quotes around $(CC)
Change-Id: I68b61bab0d7aa22932261ac3e23f0fdb57219763
2014-01-29 17:37:54 +02:00
cba1b5a27b Bypass glew when cross-compiling for now, doesn't seem to work
Change-Id: I13940a01c74a01df9b73cbf68875e3ccdaef1e47
2014-01-29 17:16:40 +02:00
69f7173669 glew: use CC from environment
Also default LD is exported from outer make, override that.

Change-Id: Iefbe7fce93e9021cbd9bb087d9becace85138f07
2014-01-29 16:02:18 +01:00
8c32cf4b2c Unbreak Cygwin patch handling
Change-Id: I7f0215f4799546e481423d6f4ab5d583bf083948
2014-01-29 10:57:41 +01:00
92e4fba401 remove unnecessary lines in glew patch
Change-Id: Ib5b12ab6502bbee92fd16f24c8398c6f657bc742
2014-01-29 08:17:28 +01:00
993eff9f18 we only need the glew libs
Change-Id: Ibb67b7cbf9c41188f026826cdacacff26b29c576
2014-01-29 08:13:12 +01:00
67669d77fd create symbols for glew in the debug case
Change-Id: Ia40d4477344f9fc0f9942a9d942b97a416ff11d7
2014-01-29 08:09:51 +01:00
03a5d0472f fix windows build of glew
Change-Id: I8aab94aefd737195a26696635f52f754764ea1b4
2014-01-29 08:09:37 +01:00
01a56100a4 make glew a normal external shared project
Change-Id: I6306e23b3f20817de87951a8848de373fc5dbf85
2014-01-29 08:09:37 +01:00