From ef8a74fe1c65bb7a915a28d97bf2acadd469dd70 Mon Sep 17 00:00:00 2001 From: Spoike Date: Thu, 21 Nov 2013 23:29:24 +0000 Subject: [PATCH] grr git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4527 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 45e46f414..cc031aa0e 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -323,22 +323,22 @@ ifeq ($(FTE_TARGET),macosx) endif BASELDFLAGS ?= -lm -ldl -lpthread -#ifeq ($(shell echo $(FTE_TARGET)|grep -v win),) -# BASELDFLAGS=-lm -# MINGW_LIBS_DIR=$(LIBS_DIR)/mingw-libs -# -# ifeq ($(shell echo $(FTE_TARGET)|grep -v win64),) -# MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs -# endif -# -# IMAGELDFLAGS=$(MINGW_LIBS_DIR)/libpng.a $(MINGW_LIBS_DIR)/libz.a $(MINGW_LIBS_DIR)/libjpeg.a -# OGGVORBISLDFLAGS=$(MINGW_LIBS_DIR)/libvorbisfile.a $(MINGW_LIBS_DIR)/libvorbis.a $(MINGW_LIBS_DIR)/libogg.a -# -# ifeq ($(shell echo $(FTE_TARGET)|grep -v -i _SDL),) -# RELEASE_CFLAGS+= -D_SDL -# SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a -L./libs/mingw64-libs -# endif -#endif +ifeq ($(shell echo $(FTE_TARGET)|grep -v win),) + BASELDFLAGS=-lm + MINGW_LIBS_DIR=$(LIBS_DIR)/mingw-libs + + ifeq ($(shell echo $(FTE_TARGET)|grep -v win64),) + MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs + endif + + IMAGELDFLAGS=$(MINGW_LIBS_DIR)/libpng.a $(MINGW_LIBS_DIR)/libz.a $(MINGW_LIBS_DIR)/libjpeg.a + OGGVORBISLDFLAGS=$(MINGW_LIBS_DIR)/libvorbisfile.a $(MINGW_LIBS_DIR)/libvorbis.a $(MINGW_LIBS_DIR)/libogg.a + + ifeq ($(shell echo $(FTE_TARGET)|grep -v -i _SDL),) + RELEASE_CFLAGS+= -D_SDL + SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a -L./libs/mingw64-libs + endif +endif IMAGELDFLAGS ?= -lpng -ljpeg OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg