zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-add $(abspath ...) wrapping to libdirs to try and fix Synthesis.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4551 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-07-23 01:48:00 +00:00
parent a187bbd8f3
commit 3403670ada
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/Makefile
View file

@ -231,7 +231,7 @@ ifneq (0,$(LUNATIC))
ifneq ($(PLATFORM),WINDOWS)
# On non-Windows, we expect to have liblpeg.a (or a symlink to it) in source/.
# On Windows, it will reside in platform/Windows/lib/32/ or lib/64/.
LIBDIRS+= -L$(DUKE3D_SRC)
LIBDIRS+= -L$(abspath $(DUKE3D_SRC))
ifeq ($(realpath $(DUKE3D_SRC)/liblpeg.a),)
# XXX: This cripples "make clean" etc. too, but IMO it's better than warning.
$(error "liblpeg.a not found in $(realpath $(DUKE3D_OBJ)/..)")
@ -280,7 +280,7 @@ endif
ifeq ($(PLATFORM),DARWIN)
COMMONFLAGS += -fno-pic
LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Apple/lib
LIBDIRS += -L$(abspath $(AUDIOLIB_ROOT)/third-party/Apple/lib)
LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
@ -298,7 +298,7 @@ endif
ifeq ($(PLATFORM),WINDOWS)
COMMONFLAGS += -fno-pic
LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lcompat-from-mingw-w64
LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Windows/lib$(WINLIB)
LIBDIRS += -L$(abspath $(AUDIOLIB_ROOT)/third-party/Windows/lib$(WINLIB))
DUKE3D_OBJS+= gameres winbits startwin.game
DUKE3D_EDITOR_OBJS+= buildres
ifeq ($(MIXERTYPE),WIN)

6
polymer/eduke32/Makefile.common
View file

@ -646,7 +646,7 @@ ifeq ($(PLATFORM),DARWIN)
ASFLAGS+= -DUNDERSCORES
# include port and brew
LIBDIRS+= -Lplatform/Apple/lib -L/opt/local/lib -L/usr/local/lib
LIBDIRS+= -L$(abspath platform/Apple/lib) -L/opt/local/lib -L/usr/local/lib
COMPILERFLAGS+= -Iplatform/Apple/include -I/opt/local/include -I/sw/include -I/usr/local/include
RENDERTYPE = SDL
@ -709,7 +709,7 @@ ifeq ($(PLATFORM),WINDOWS)
SDL_FRAMEWORK=1
EXESUFFIX=.exe
DLLSUFFIX=.dll
LIBDIRS+= -Lplatform/Windows/lib$(WINLIB)
LIBDIRS+= -L$(abspath platform/Windows/lib$(WINLIB))
LIBS+= -Wl,--enable-auto-import -lmingwex -lgdi32 -lcomctl32 -lwinmm $(L_SSP) -lwsock32 -lws2_32 -lshlwapi
ifeq (0,$(CLANG))
LIBS+= -mwindows
@ -764,7 +764,7 @@ ifeq ($(PLATFORM),WII)
SDLCONFIG=
SDL_TARGET=1
SDL_FRAMEWORK=1
LIBDIRS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -Lplatform/Wii/lib
LIBDIRS += -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib -L$(abspath platform/Wii/lib)
endif
ifeq ($(PLATFORM),QNX)
RENDERTYPE=SDL