[GB.JIT]
* BUG: Fix to locate JIT.H and resolve issue where multiple versions of llvm present. JIT.H is only available prior to llvm 5.6 and GB.JIT can only be compiled with those versions. [GB.SDL] * NEW: Cygwin needs the shared library x11 - as per Bastian Germann [GB.XML] * NEW: Cygwin changes - as per Bastian Germann git-svn-id: svn://localhost/gambas/trunk@7931 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
parent
a28a30d0f4
commit
41895f5a54
7 changed files with 7 additions and 7 deletions
|
@ -37,7 +37,7 @@ fi
|
|||
|
||||
GB_COMPONENT(
|
||||
jit, JIT, gb.jit, [src],
|
||||
[GB_FIND(llvm/Config/llvm-config.h llvm-c/Core.h, `$LLVM_CONFIG --prefix` /usr/lib/llvm* /usr/local /usr, include)],
|
||||
[GB_FIND(llvm/ExecutionEngine/JIT.h llvm/Config/llvm-config.h llvm-c/Core.h, `$LLVM_CONFIG --prefix` /usr/lib/llvm* /usr/local /usr, include)],
|
||||
[GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, `$LLVM_CONFIG --prefix` /usr/lib/llvm* /usr/local /usr, lib)],
|
||||
[$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION],
|
||||
[-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS])
|
||||
|
|
|
@ -33,7 +33,7 @@ dnl [$SDL_CFLAGS])
|
|||
|
||||
GB_COMPONENT_SEARCH(
|
||||
sdl, SDL, gb.sdl, [src],
|
||||
sdl "> 1.2.8" SDL_ttf glew xcursor,
|
||||
sdl "> 1.2.8" SDL_ttf glew xcursor x11,
|
||||
[GB_FIND(GL/glew.h SDL_ttf.h X11/Xcursor/Xcursor.h, /usr /usr/local `sdl-config --prefix`, include include/SDL)],
|
||||
[GB_FIND(libSDL_ttf.$SHLIBEXT libGLEW.$SHLIBEXT libXcursor.$SHLIBEXT, /usr /usr/local `sdl-config --prefix`, lib)],
|
||||
[$X_LIBS -lSDL_ttf -lGLEW -lXcursor],
|
||||
|
|
|
@ -192,7 +192,7 @@ typedef struct
|
|||
|
||||
void (*ThrowXMLParseException)(const char* nerror, const char *text, const size_t lenText, const char *posFailed);
|
||||
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__)
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
|
||||
void* (*memrchr)(const char *s, int c, size_t n);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
extern "C" XML_INTERFACE XML;
|
||||
#endif
|
||||
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__)
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
|
||||
#define memrchr(s, c, n) XML.memrchr(s, c, n)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ extern "C"
|
|||
|
||||
(void *)ThrowXMLParseException,
|
||||
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__)
|
||||
#if defined(OS_MACOSX) || defined(__APPLE__) || defined(__CYGWIN__)
|
||||
(void*)memrchr,
|
||||
#endif
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <stdio.h>
|
||||
#include <memory.h>
|
||||
|
||||
#ifdef OS_MACOSX
|
||||
#if defined(OS_MACOSX) || defined(__CYGWIN__)
|
||||
void *memrchr(const char *s, int c, size_t n)
|
||||
{
|
||||
const char *start=s,*end=(s+n-1);
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#define CHAR_ERROR 0xFFFD // <20>
|
||||
|
||||
#ifdef OS_MACOSX
|
||||
#if defined(OS_MACOSX) || defined(__CYGWIN__)
|
||||
#include <string.h>
|
||||
void *memrchr(const char *s, int c, size_t n);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue