From e7b205d37b150910837577b3b1d06c2369cfcc4a Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sat, 16 Apr 2016 13:22:57 +0900 Subject: [PATCH] Linux build fix --- Makefile | 2 +- Makefile.common | 4 ++++ Makefile.emscripten | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4fde97c..b6c7828 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ ifdef EMSCRIPTEN include Makefile.emscripten else UNAME := $(shell uname -s) - ifeq ($(UNAME_S),Linux) + ifeq ($(UNAME),Linux) include Makefile.linux else include Makefile.win diff --git a/Makefile.common b/Makefile.common index a2a1add..e386d5d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -27,4 +27,8 @@ WINOBJS := \ src/res3/Script1.o LINUXOBJS := \ + src/linux/nact_linux.o \ + src/linux/mako_linux.o + +EMOBJS := \ src/linux/nact_linux.o diff --git a/Makefile.emscripten b/Makefile.emscripten index 25b8ff5..868b3a0 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -1,6 +1,6 @@ # -*- Makefile -*- -OBJS := $(SYSOBJS) $(LINUXOBJS) +OBJS := $(SYSOBJS) $(EMOBJS) DEPS := $(OBJS:%.o=%.d)