From 4182d5d1604cb9f9b89792dac5f21f7648ca8000 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 11 May 2013 14:10:06 +0000 Subject: [PATCH] revert that breakage git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4356 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 7bfe08d6d..6dba3a5e5 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -24,7 +24,9 @@ WHOAMI:=$(shell whoami) #linux->linux64 (FTE_TARGET=linux64) #linux->morphos (FTE_TARGET=morphos) #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 ifeq ($(FTE_TARGET),win32) @@ -305,8 +307,7 @@ ifeq ($(shell echo $(FTE_TARGET)|grep -v win),) MINGW_LIBS_DIR=$(LIBS_DIR)/mingw-libs ifeq ($(shell echo $(FTE_TARGET)|grep -v win64),) - MINGW_LIBS_DIR=$(BASE_DIR)/libs-x86_64-w64-mingw32 - #$(LIBS_DIR)/mingw64-libs + MINGW_LIBS_DIR=$(LIBS_DIR)/mingw64-libs endif IMAGELDFLAGS=$(MINGW_LIBS_DIR)/libpng.a $(MINGW_LIBS_DIR)/libz.a $(MINGW_LIBS_DIR)/libjpeg.a @@ -1591,4 +1592,4 @@ else -endif \ No newline at end of file +endif