summaryrefslogtreecommitdiffstats
path: root/makefile
diff options
context:
space:
mode:
authorGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2010-01-15 21:05:29 +0000
committerGravatarGravatar R. Belmont <rb6502@users.noreply.github.com>2010-01-15 21:05:29 +0000
commit9ba62e6bce2539b6f312a89109a1aa989c8a88a4 (patch) (github)
tree30e1993f05ad2042ce0d99d2d75be59689236361 /makefile
parent3997330a94e0ec1b061689a945cdb98c7de718a5 (diff)
downloadmame-9ba62e6bce2539b6f312a89109a1aa989c8a88a4.tar.bz2
mame-9ba62e6bce2539b6f312a89109a1aa989c8a88a4.zip
SDLMAME: improved OS X and SDL 1.3 SVN support, try to autodetect SDLMAME targets [Couriersud]
Diffstat (limited to 'makefile')
-rw-r--r--makefile18
1 files changed, 17 insertions, 1 deletions
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