git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4527 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-11-21 23:29:24 +00:00
parent 31c072501f
commit ef8a74fe1c

View file

@ -323,22 +323,22 @@ ifeq ($(FTE_TARGET),macosx)
endif endif
BASELDFLAGS ?= -lm -ldl -lpthread BASELDFLAGS ?= -lm -ldl -lpthread
#ifeq ($(shell echo $(FTE_TARGET)|grep -v win),) ifeq ($(shell echo $(FTE_TARGET)|grep -v win),)
# BASELDFLAGS=-lm BASELDFLAGS=-lm
# MINGW_LIBS_DIR=$(LIBS_DIR)/mingw-libs MINGW_LIBS_DIR=$(LIBS_DIR)/mingw-libs
#
# ifeq ($(shell echo $(FTE_TARGET)|grep -v win64),) ifeq ($(shell echo $(FTE_TARGET)|grep -v win64),)
# MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs
# endif endif
#
# IMAGELDFLAGS=$(MINGW_LIBS_DIR)/libpng.a $(MINGW_LIBS_DIR)/libz.a $(MINGW_LIBS_DIR)/libjpeg.a 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 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),) ifeq ($(shell echo $(FTE_TARGET)|grep -v -i _SDL),)
# RELEASE_CFLAGS+= -D_SDL RELEASE_CFLAGS+= -D_SDL
# SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a -L./libs/mingw64-libs SDL_LDFLAGS=$(MINGW_LIBS_DIR)/libSDL.a $(MINGW_LIBS_DIR)/libSDLmain.a -L./libs/mingw64-libs
# endif endif
#endif endif
IMAGELDFLAGS ?= -lpng -ljpeg IMAGELDFLAGS ?= -lpng -ljpeg
OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg