Commit 3032d7f4 authored by amdmi3's avatar amdmi3
Browse files

- Unbreak

- Add missing USES=iconv

Approved by:	portmgr blanket
MFH:		2014Q4
parent 9ea5581e
......@@ -10,18 +10,16 @@ MASTER_SITES= LOCAL/rene
MAINTAINER= acm@FreeBSD.org
COMMENT= Eternal Lands is a free 3D MMORPG
BROKEN= Fails to build
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
libvorbis.so:${PORTSDIR}/audio/libvorbis \
libcal3d.so:${PORTSDIR}/graphics/cal3d
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data
USES= gmake openal:al,alut tar:xz
USES= compiler:c++11-lang gmake iconv openal:al,alut tar:xz
USE_GNOME= libxml2
USE_SDL= sdl net image
USE_GL= yes
LDFLAGS+= -L${LOCALBASE}/lib -lX11
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lX11
ALL_TARGET= el.bin
MAKEFILE= Makefile.bsd
......
......@@ -22,7 +22,7 @@
+LDFLAGS+=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
-_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
+_LDFLAGS=$(XDIR) -lGL -pthread -lstdc++
+_LDFLAGS=$(XDIR) -lGL -pthread
# This works on Ubuntu 8.04 (LTS) at least
# Install these packages in addition to those required for a standard build
......@@ -43,7 +43,7 @@
endif
ifndef LINK
-LINK=gcc
+LINK?=$(CC)
+LINK?=$(CXX)
endif
all: $(EXE)
--- platform.h.orig
+++ platform.h
--- platform.h.orig 2014-01-06 18:17:50.000000000 +0400
+++ platform.h 2014-11-21 19:53:36.000000000 +0300
@@ -11,7 +11,7 @@
// http://predef.sourceforge.net/prearch.html , these ought to work on
// gcc, Sun Studio and Visual Studio.
......@@ -9,3 +9,22 @@
#define X86_64
#endif
@@ -85,16 +85,13 @@
#include "elglext.h"
#define APIENTRY
#define APIENTRYP *
-#elif !defined(BSD)
+#else
#define GL_GLEXT_LEGACY
#include <GL/gl.h>
#include <GL/glu.h>
#undef GL_VERSION_1_2
#undef GL_VERSION_1_3
- #include "glext.h"
-#else // BSD
- #include <GL/gl.h>
- #include <GL/glu.h>
+ #include <GL/glext.h>
#endif
// Inlucde the plaform specific location sound libs
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment