From: Teemu Hukkanen <tjhukkan@iki.fi>
Date: Sun, 21 Sep 2014 13:01:43 +0000 (+0100)
Subject: Simplify platform detection in jaguarcore.mak
X-Git-Tag: 2.1.1~6^2
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=8ad74866de6af27e3ef54ecd60874be774721830;p=virtualjaguar

Simplify platform detection in jaguarcore.mak

Default SYSTYPE to __GCCUNIX__, and change it only for special cases,
instead of the other way around.

Remove SDLLIBTYPE, it wasn't used at all.
---

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 31bd4a8..6b5b9ee 100644
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -10,43 +10,15 @@
 # Cross compilation with MXE
 #CROSS = i686-pc-mingw32-
 
-# Figure out which system we're compiling for, and set the appropriate variables
-
-ifeq "$(CROSS)" ""
-OSTYPE := $(shell uname -a)
-
-# Win32
-ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
-
-SYSTYPE    := __GCCWIN32__
-SDLLIBTYPE := --libs
-
-# Apple. Should catch both 'darwin' and 'darwin7.0'
-else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
-
-SYSTYPE    := __GCCUNIX__ -D__THINK_STUPID__
-SDLLIBTYPE := --static-libs
-
-# Linux
-else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
-
 SYSTYPE    := __GCCUNIX__
-SDLLIBTYPE := --libs
-
-else ifeq "$(findstring kFreeBSD,$(OSTYPE))" "kFreeBSD"
 
-SYSTYPE    := __GCCUNIX__
-SDLLIBTYPE := --libs
-
-# ??? Throw error, unknown OS
-else
-
-$(error OS TYPE UNDETECTED)
-
-endif
+ifneq "$(CROSS)" ""
+SYSTYPE    := __GCCWIN32__
 else
+OSTYPE := $(shell uname -o)
+ifeq "$(OSTYPE)" "Msys"
 SYSTYPE    := __GCCWIN32__
-SDLLIBTYPE := --libs
+endif
 endif
 
 # Set vars for libcdio