From 7a2da3127e3da86f89f5fb119d71c0072bc36b89 Mon Sep 17 00:00:00 2001
From: Kalamatee <kalamatee@gmail.com>
Date: Sat, 1 Apr 2017 02:18:53 +0100
Subject: [PATCH] update for AROS trunk changes

---
 neo/mmakefile.src | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/neo/mmakefile.src b/neo/mmakefile.src
index c2afa0de..b5e2f88d 100644
--- a/neo/mmakefile.src
+++ b/neo/mmakefile.src
@@ -20,25 +20,25 @@ USER_LDFLAGS := -static-libstdc++
 
 #MM aros-doom3 : aros-doom3-libs iconset-Gorilla-contrib-icons-extras-games-adoom3 iconset-Gorilla-contrib-games-doom3game
 
-DOOM3_OPTIONS := -DCORE=ON -DDEDICATED=ON -DBASE=ON -DSDL2=OFF\
+DOOM3_OPTIONS := -DCORE=ON -DDEDICATED=ON -DBASE=ON -DSDL2=OFF \
         -DCMAKE_INSTALL_BINDIR= \
         -DCMAKE_INSTALL_LIBDIR= \
-        -DZLIB_LIBRARY=$(AROS_DEVELOPMENT)/lib/libz.a \
-        -DZLIB_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DJPEG_LIBRARY=$(AROS_DEVELOPMENT)/lib/libjpeg.a \
-        -DJPEG_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DOPENAL_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DOPENAL_LIBRARY="$(AROS_DEVELOPMENT)/lib/libopenal.a;$(AROS_DEVELOPMENT)/lib/libpthread.a;" \
-        -DOGG_LIBRARY=$(AROS_DEVELOPMENT)/lib/libogg.a \
-        -DOGG_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DVORBIS_LIBRARY=$(AROS_DEVELOPMENT)/lib/libvorbis.a \
-        -DVORBIS_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DVORBISFILE_LIBRARY=$(AROS_DEVELOPMENT)/lib/libvorbisfile.a \
-        -DVORBISFILE_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-	-DCURL_LIBRARY="$(AROS_DEVELOPMENT)/lib/libcurl.a;$(AROS_DEVELOPMENT)/lib/libiconv.a;$(AROS_DEVELOPMENT)/lib/libz.a;$(AROS_DEVELOPMENT)/lib/libssl.a;$(AROS_DEVELOPMENT)/lib/libcrypto.a;" \
-        -DCURL_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include \
-        -DSDL_LIBRARY=$(AROS_DEVELOPMENT)/lib/libSDL.a \
-        -DSDL_INCLUDE_DIR=$(AROS_DEVELOPMENT)/include/SDL
+        -DZLIB_LIBRARY=$(AROS_DEVELOPER)/lib/libz.a \
+        -DZLIB_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DJPEG_LIBRARY=$(AROS_DEVELOPER)/lib/libjpeg.a \
+        -DJPEG_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DOPENAL_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DOPENAL_LIBRARY="$(AROS_DEVELOPER)/lib/libopenal.a;$(AROS_DEVELOPER)/lib/libpthread.a;" \
+        -DOGG_LIBRARY=$(AROS_DEVELOPER)/lib/libogg.a \
+        -DOGG_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DVORBIS_LIBRARY=$(AROS_DEVELOPER)/lib/libvorbis.a \
+        -DVORBIS_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DVORBISFILE_LIBRARY=$(AROS_DEVELOPER)/lib/libvorbisfile.a \
+        -DVORBISFILE_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+	-DCURL_LIBRARY="$(AROS_DEVELOPER)/lib/libcurl.a;$(AROS_DEVELOPER)/lib/libiconv.a;$(AROS_DEVELOPER)/lib/libz.a;$(AROS_DEVELOPER)/lib/libssl.a;$(AROS_DEVELOPER)/lib/libcrypto.a;" \
+        -DCURL_INCLUDE_DIR=$(AROS_DEVELOPER)/include \
+        -DSDL_LIBRARY=$(AROS_DEVELOPER)/lib/libSDL.a \
+        -DSDL_INCLUDE_DIR=$(AROS_DEVELOPER)/include/SDL
 
 %build_with_cmake mmake=aros-doom3		\
     	prefix="$(DOOM3_EXEDIR)"		\