ソースを参照

Fixed travis (#89)

* (Travis) Added libuv and OpenAL soft dependencies

* (Travis) Try to fix uv compilation on linux
Pascal Peridont 8 年 前
コミット
7b140b7175
5 ファイル変更7 行追加4 行削除
  1. 1 1
      .travis.yml
  2. 2 0
      Dockerfile
  3. 2 0
      Dockerfile-i386
  4. 1 2
      Makefile
  5. 1 1
      libs/uv/uv.c

+ 1 - 1
.travis.yml

@@ -36,7 +36,7 @@ docker_cmake_script: &docker_make_script
 
 mac_before_install: &mac_before_install
   - brew update
-  - brew install jpeg-turbo sdl2 libogg libvorbis openal-soft mbedtls
+  - brew install jpeg-turbo sdl2 libogg libvorbis openal-soft mbedtls libuv
   - haxelib install hashlink
 
 make_install: &make_install

+ 2 - 0
Dockerfile

@@ -12,6 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libalut-dev \
         libmbedtls-dev \
         libturbojpeg0-dev \
+        libuv1-dev \
+        libopenal-dev \
         neko \
         curl \
         ca-certificates \

+ 2 - 0
Dockerfile-i386

@@ -12,6 +12,8 @@ RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y --no-in
         libalut-dev:i386 \
         libmbedtls-dev:i386 \
         libturbojpeg0-dev:i386 \
+        libuv1-dev:i386 \
+        libopenal-dev:i386 \
         neko \
         curl \
         ca-certificates \

+ 1 - 2
Makefile

@@ -63,11 +63,10 @@ LIBOPENGL = -framework OpenGL
 LIBOPENAL = -lopenal
 LIBSSL = -framework Security -framework CoreFoundation
 
-
 else
 
 # Linux
-CFLAGS += -m$(ARCH) -fPIC
+CFLAGS += -m$(ARCH) -fPIC -pthread
 LFLAGS += -lm -Wl,--export-dynamic -Wl,--no-undefined
 
 ifeq ($(ARCH),32)

+ 1 - 1
libs/uv/uv.c

@@ -1,6 +1,6 @@
 #define HL_NAME(n) uv_##n
-#include <uv.h>
 #include <hl.h>
+#include <uv.h>
 
 #define EVT_CLOSE	1