diff options
author | Justin Kerk <dopefishjustin@gmail.com> | 2013-11-03 22:52:48 +0000 |
---|---|---|
committer | Justin Kerk <dopefishjustin@gmail.com> | 2013-11-03 22:52:48 +0000 |
commit | 7a9c6bf11627fd3e0529f62520ba1f50a8e5b1ec (patch) | |
tree | 1769129f712703cccc39970617ecf0e6d823467a | |
parent | e05327df993d6aa6771c20342d5f9e4932f79312 (diff) |
Emscripten makefile stuff (nw)
-rw-r--r-- | makefile | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -329,9 +329,11 @@ BUILD_EXE = $(EXE) endif # compiler, linker and utilities +ifneq ($(TARGETOS),emscripten) AR = @ar CC = @gcc LD = @g++ +endif MD = -mkdir$(EXE) RM = @rm -f OBJDUMP = @objdump @@ -396,6 +398,11 @@ SRC = src # build the targets in different object dirs, so they can co-exist OBJ = obj/$(PREFIX)$(OSD)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE) +ifeq ($(CROSS_BUILD),1) +ifndef NATIVE_OBJ +NATIVE_OBJ = OBJ +endif # NATIVE_OBJ +endif # CROSS_BUILD #------------------------------------------------- @@ -597,6 +604,9 @@ ifeq ($(COMMAND_MODE),"legacy") ARFLAGS = -crs endif endif +ifeq ($(TARGETOS),emscripten) +ARFLAGS = cr +endif #------------------------------------------------- @@ -765,6 +775,9 @@ BUILDSRC = $(SRC)/build BUILDOBJ = $(OBJ)/build BUILDOUT = $(BUILDOBJ) +ifdef NATIVE_OBJ +BUILDOUT = $(NATIVE_OBJ)/build +endif # NATIVE_OBJ #------------------------------------------------- |