forked from Lainports/freebsd-ports
24 lines
1.8 KiB
Text
24 lines
1.8 KiB
Text
--- GNUmakefile.orig 2011-12-15 12:54:49.000000000 +0200
|
|
+++ GNUmakefile 2012-02-23 19:59:43.906322555 +0200
|
|
@@ -4,7 +4,7 @@ include config.make
|
|
vpath %.m src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
|
|
vpath %.h src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
|
|
vpath %.c src/SDL:src/Core:src/BSDCompat:src/Core/Debug
|
|
-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
|
|
+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
|
|
GNUSTEP_OBJ_DIR_BASENAME := $(GNUSTEP_OBJ_DIR_NAME)
|
|
HOST_ARCH := $(shell echo $(GNUSTEP_HOST_CPU) | sed -e s/i.86/x86/ -e s/amd64/x86_64/ )
|
|
ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
|
@@ -37,10 +37,10 @@ else
|
|
LIBJS = js_static
|
|
|
|
ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
|
|
- ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lX11 -lSDL -lSDL_mixer -lgnustep-base -l$(LIBJS) `nspr-config --libs` -lstdc++
|
|
+ ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lX11 -lSDL -lSDL_mixer -lgnustep-base -l$(LIBJS) `nspr-config --libs` `sdl-config --libs` -lstdc++
|
|
ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags` `nspr-config --cflags`
|
|
ADDITIONAL_OBJCFLAGS = -Wall -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags`
|
|
- oolite_LIB_DIRS += -L/usr/X11R6/lib/ -L$(LIBJS_LIB_DIR)
|
|
+ oolite_LIB_DIRS += -L${LOCALBASE}/lib/ -L$(LIBJS_LIB_DIR)
|
|
|
|
ifeq ($(use_deps),yes)
|
|
oolite_LIB_DIRS += -Ldeps/Linux-deps/$(HOST_ARCH)/lib_linker
|