Permalink
Browse files

fixes to the osx builds and updated libs

  • Loading branch information...
jackeri committed Nov 14, 2017
1 parent e077a11 commit 5fcdf76347790bb6f79b8b9b3e3bbeb5a8bb5b49
Showing with 27 additions and 25 deletions.
  1. +1 −1 .gitignore
  2. +0 −16 Dockerfile
  3. +1 −1 cmake/ETLBuildMod.cmake
  4. +1 −1 cmake/ETLPlatform.cmake
  5. +2 −1 easybuild.sh
  6. +1 −1 libs
  7. +18 −0 misc/docker/Dockerfile
  8. +1 −1 src/sdl/sdl_defs.h
  9. +1 −2 src/sys/SDLMain.m
  10. +1 −1 src/tinygettext/tinygettext/iconv.hpp
View
@@ -1,7 +1,7 @@
#
# Project specific
#
/build
/build*/
/project
/obj
/doc
View

This file was deleted.

Oops, something went wrong.
View
@@ -101,7 +101,7 @@ if(BUILD_MOD_PK3)
add_custom_target(mod_pk3 ALL DEPENDS legacy/etl_bin_${ETL_CMAKE_VERSION_SHORT}.pk3)
if(APPLE)
set(ZIP_FILE_LIST cgame${LIB_SUFFIX}${ARCH}* ui${LIB_SUFFIX}${ARCH}*)
set(ZIP_FILE_LIST cgame${LIB_SUFFIX}${ARCH} ui${LIB_SUFFIX}${ARCH})
else()
set(ZIP_FILE_LIST cgame${LIB_SUFFIX}${ARCH}${CMAKE_SHARED_LIBRARY_SUFFIX} ui${LIB_SUFFIX}${ARCH}${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
View
@@ -81,7 +81,7 @@ if(UNIX)
set(CMAKE_CXX_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
if(BUILD_CLIENT)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Quartz -framework AudioUnit -framework Carbon -framework CoreAudio -framework ForceFeedback -liconv")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Quartz -framework AudioToolbox -framework AudioUnit -framework Carbon -framework CoreAudio -framework ForceFeedback -liconv")
endif()
set(LIB_SUFFIX "_mac")
set(CMAKE_SHARED_MODULE_SUFFIX "")
View
@@ -7,7 +7,8 @@
# Mandatory variables
_SRC=`pwd`
BUILDDIR="${_SRC}/build"
#BUILDDIR="${_SRC}/build"
BUILDDIR="${BUILD_DIR:-${_SRC}/build}"
SOURCEDIR="${_SRC}/src"
PROJECTDIR="${_SRC}/project"
LEGACYETMAIN="${HOME}/.etlegacy/etmain"
2 libs
Submodule libs updated 1 files
+216 −106 CMakeLists.txt
View
@@ -0,0 +1,18 @@
FROM centos:6.7
RUN cd /tmp && \
echo "multilib_policy=all" >> /etc/yum.conf && \
yum update -y && \
yum groupinstall -y "Development tools" && \
yum -y install git tar freeglut-devel gmake glibc glibc-devel libX11 libX11-devel mesa-libGL mesa-libGL-devel curl-devel zlib-devel wget nasm which && \
yum clean all
RUN wget http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.gz && tar -xvzf m4-1.4.18.tar.gz && cd m4-1.4.18 && ./configure --prefix=/usr/local && make && make install && cd .. && \
wget http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/libtool/libtool-2.4.6.tar.gz && tar -xvzf libtool-2.4.6.tar.gz && cd libtool-2.4.6 && ./configure --prefix=/usr/local && make && make install && cd .. && \
wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && tar -xvzf autoconf-2.69.tar.gz && cd autoconf-2.69 && ./configure --prefix=/usr/local && make && make install && cd .. && \
wget http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz && tar -xvzf automake-1.15.tar.gz && cd automake-1.15 && ./configure --prefix=/usr/local && make && make install && cd .. && \
wget https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz && tar -xf cmake-3.9.6.tar.gz && cd cmake-3.9.6 && ./configure --prefix=/usr/local --system-curl && gmake && gmake install && cd .. && \
rm -Rf m4-1.4.18* libtool-2.4.6* autoconf-2.69* automake-1.15* cmake-3.9.6*
VOLUME /code
WORKDIR /code
View
@@ -35,7 +35,7 @@
#ifndef INCLUDE_SDLDEF_H
#define INCLUDE_SDLDEF_H
#if defined(BUNDLED_SDL) || __APPLE__
#if !defined(BUNDLED_SDL) && __APPLE__
#include "SDL.h"
#include "SDL_cpuinfo.h"
#include "SDL_syswm.h"
View
@@ -10,8 +10,7 @@
#import <Cocoa/Cocoa.h>
#import <sys/param.h>
#import "SDL.h"
#import "SDLMain.h"
#import "SDL2/SDL.h"
#define SDL_USE_CPS 1
@@ -23,7 +23,7 @@
#include <string>
#ifdef HAVE_SDL
# include "SDL.h"
# include "SDL2/SDL.h"
# define tinygettext_ICONV_CONST const
# define tinygettext_iconv_t SDL_iconv_t

0 comments on commit 5fcdf76

Please sign in to comment.