mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-10 22:51:57 +00:00
revert that breakage
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4356 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
9dbf5b5837
commit
4182d5d160
1 changed files with 5 additions and 4 deletions
|
@ -24,7 +24,9 @@ WHOAMI:=$(shell whoami)
|
||||||
#linux->linux64 (FTE_TARGET=linux64)
|
#linux->linux64 (FTE_TARGET=linux64)
|
||||||
#linux->morphos (FTE_TARGET=morphos)
|
#linux->morphos (FTE_TARGET=morphos)
|
||||||
#linux->macosx (FTE_TARGET=macosx) or (FTE_TARGET=macosx_x86)
|
#linux->macosx (FTE_TARGET=macosx) or (FTE_TARGET=macosx_x86)
|
||||||
#if you are cross compiling, you'll need to use FTE_TARGET=mytaget
|
#linux->javascript (FTE_TARGET=web)
|
||||||
|
#linux->nacl (FTE_TARGET=nacl NARCH=x86_64)
|
||||||
|
#if you are cross compiling, you'll need to use FTE_TARGET=mytarget
|
||||||
|
|
||||||
#correct the gcc build when cross compiling
|
#correct the gcc build when cross compiling
|
||||||
ifeq ($(FTE_TARGET),win32)
|
ifeq ($(FTE_TARGET),win32)
|
||||||
|
@ -305,8 +307,7 @@ ifeq ($(shell echo $(FTE_TARGET)|grep -v win),)
|
||||||
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=$(BASE_DIR)/libs-x86_64-w64-mingw32
|
MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs
|
||||||
#$(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
|
||||||
|
@ -1591,4 +1592,4 @@ else
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue