From afaa1dc223ec87b685778ee0aed81cb6caaa05c7 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Wed, 7 Aug 2013 01:38:18 +0200
Subject: Get rid of QNAM (now subclassed and less needy). Basic LWJGL download
 and extraction.

---
 backend/OneSixVersion.h | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'backend/OneSixVersion.h')

diff --git a/backend/OneSixVersion.h b/backend/OneSixVersion.h
index 160d0426..1f8090ab 100644
--- a/backend/OneSixVersion.h
+++ b/backend/OneSixVersion.h
@@ -13,23 +13,14 @@ enum OpSys
 
 OpSys OpSys_fromString(QString);
 
-#ifdef Q_OS_MAC
-	#define currentSystem Os_OSX
-#endif
-
-#ifdef Q_OS_LINUX
-	#define currentSystem Os_Linux
-#endif
-
 #ifdef Q_OS_WIN32
 	#define currentSystem Os_Windows
+#elif Q_OS_MAC
+	#define currentSystem Os_OSX
+#else
+	#define currentSystem Os_Linux
 #endif
 
-#ifndef currentSystem
-	#define currentSystem Os_Other
-#endif
-
-
 enum RuleAction
 {
 	Allow,
-- 
cgit