From 9ba62e6bce2539b6f312a89109a1aa989c8a88a4 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Fri, 15 Jan 2010 21:05:29 +0000 Subject: SDLMAME: improved OS X and SDL 1.3 SVN support, try to autodetect SDLMAME targets [Couriersud] --- makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index 910aa0be3fb..f9e2eca2db8 100644 --- a/makefile +++ b/makefile @@ -64,10 +64,24 @@ ifndef TARGETOS ifeq ($(OS),Windows_NT) TARGETOS = win32 else + +UNAME = $(shell uname -a) + +ifeq ($(filter Linux,$(UNAME)),Linux) TARGETOS = unix endif +ifeq ($(filter Solaris,$(UNAME)),Solaris) +TARGETOS = solaris +endif +ifeq ($(filter FreeBSD,$(UNAME)),FreeBSD) +TARGETOS = freebsd +endif +ifeq ($(filter Darwin,$(UNAME)),Darwin) +TARGETOS = macosx endif +endif +endif #------------------------------------------------- @@ -608,5 +622,7 @@ $(OBJ)/%.a: ifeq ($(TARGETOS),macosx) $(OBJ)/%.o: $(SRC)/%.m | $(OSPREBUILD) @echo Objective-C compiling $<... - $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@ + #$(CC) -x objective-c++ $(CDEFS) $(CCOMFLAGS) $(CONLYFLAGS) -c $< -o $@ + $(CC) -x objective-c++ $(CDEFS) $(CCOMFLAGS) -c $< -o $@ + #$(CC) $(CDEFS) $(CFLAGS) -c $< -o $@ endif -- cgit v1.2.3