From: Shamus Hammons <jlhamm@acm.org>
Date: Mon, 6 Oct 2014 13:20:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'partycle/platform_detect'
X-Git-Tag: 2.1.1~6
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfee3ca4b91ce7056d4f8b2cafa56628ae6b568d;hp=97421b051237fbe8e117436101a9fedec417faa0;p=virtualjaguar

Merge remote-tracking branch 'partycle/platform_detect'
---

diff --git a/jaguarcore.mak b/jaguarcore.mak
index 45d2e43..9d44b41 100644
--- a/jaguarcore.mak
+++ b/jaguarcore.mak
@@ -16,43 +16,15 @@ endif
 # 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