From da79d11db56cea2a68ce830dcf0bc455d0d2bd6a Mon Sep 17 00:00:00 2001
From: shuffle2 <shuffle2@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Mon, 15 Mar 2010 20:44:20 +0000
Subject: [PATCH] should fix remaining build errors on linux...

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@943 a31d4220-a93d-0410-bf67-fe4944624d44
---
 src/gba/GBA.cpp     | 22 +++-------------------
 src/gba/GBALink.cpp |  3 +--
 src/gba/GBALink.h   | 14 +++++++++++---
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/gba/GBA.cpp b/src/gba/GBA.cpp
index 93de208d..9b13d628 100644
--- a/src/gba/GBA.cpp
+++ b/src/gba/GBA.cpp
@@ -20,6 +20,7 @@
 #include "../common/Port.h"
 #include "../System.h"
 #include "agbprint.h"
+#include "GBALink.h"
 
 #ifdef PROFILING
 #include "prof/prof.h"
@@ -31,15 +32,6 @@
 
 extern int emulating;
 
-#include "GBALink.h"
-extern int linktime;
-extern void StartLink(u16);
-extern void StartGPLink(u16);
-extern void LinkSSend(u16);
-extern void LinkUpdate(int);
-extern int linktime2;
-extern bool linkenable;
-
 int SWITicks = 0;
 int IRQTicks = 0;
 
@@ -2796,10 +2788,8 @@ void CPUUpdateRegister(u32 address, u16 value)
 	  break;
 
   case COMM_SIODATA8:
-#ifdef _MSC_VER
-	  if (gba_link_enabled && lspeed)
+	  if (gba_link_enabled)
 		  LinkSSend(value);
-#endif
 	  UPDATE_REG(COMM_RCNT, value);
 	  break;
 
@@ -3433,12 +3423,10 @@ void CPULoop(int ticks)
   int timerOverflow = 0;
   // variable used by the CPU core
   cpuTotalTicks = 0;
-  
-#ifdef _MSC_VER
+
   // shuffle2: what's the purpose?
   if(gba_link_enabled)
     cpuNextEvent = 1;
-#endif
 
   cpuBreakLoop = false;
   cpuNextEvent = CPUUpdateTicks();
@@ -3898,10 +3886,8 @@ void CPULoop(int ticks)
 	  if (gba_joybus_enabled)
 		  JoyBusUpdate(clockTicks);
 
-#ifdef _MSC_VER
 	  if (gba_link_enabled)
 		  LinkUpdate(clockTicks);
-#endif
 
       cpuNextEvent = CPUUpdateTicks();
 
@@ -3917,11 +3903,9 @@ void CPULoop(int ticks)
         goto updateLoop;
       }
 
-#ifdef _MSC_VER
 	  // shuffle2: what's the purpose?
 	  if(gba_link_enabled)
   	       cpuNextEvent = 1;
-#endif
 
       if(IF && (IME & 1) && armIrqEnable) {
         int res = IF & IE;
diff --git a/src/gba/GBALink.cpp b/src/gba/GBALink.cpp
index 527d4309..600398e4 100644
--- a/src/gba/GBALink.cpp
+++ b/src/gba/GBALink.cpp
@@ -23,10 +23,10 @@ bool gba_joybus_enabled = false;
 GBASockClient* dol = NULL;
 sf::IPAddress joybusHostAddr = sf::IPAddress::LocalHost;
 
-#ifdef _MSC_VER
 // If disabled, gba core won't call any (non-joybus) link functions
 bool gba_link_enabled = false;
 
+#ifdef _MSC_VER
 // Hodgepodge
 u8 tspeed = 3;
 u8 transfer = 0;
@@ -40,7 +40,6 @@ static int i, j;
 int linktimeout = 1000;
 LANLINKDATA lanlink;
 u16 linkdata[4];
-int lspeed = 0;
 lserver ls;
 lclient lc;
 bool oncewait = false, after = false;
diff --git a/src/gba/GBALink.h b/src/gba/GBALink.h
index cdd843a5..4a81cfe0 100644
--- a/src/gba/GBALink.h
+++ b/src/gba/GBALink.h
@@ -121,8 +121,13 @@ extern void JoyBusConnect();
 extern void JoyBusShutdown();
 extern void JoyBusUpdate(int ticks);
 
+extern bool gba_link_enabled;
+
 #ifdef _MSC_VER
-extern void LinkUpdate();
+extern void StartLink(u16);
+extern void StartGPLink(u16);
+extern void LinkSSend(u16);
+extern void LinkUpdate(int);
 extern void LinkChildStop();
 extern void LinkChildSend(u16);
 extern void CloseLanLink();
@@ -130,9 +135,12 @@ extern char *MakeInstanceFilename(const char *Input);
 extern LANLINKDATA lanlink;
 extern int vbaid;
 extern bool rfu_enabled;
-extern bool gba_link_enabled;
 extern int linktimeout;
 extern lclient lc;
 extern int linkid;
-extern int lspeed;
+#else // These are stubbed for now
+inline void StartLink(u16){}
+inline void StartGPLink(u16){}
+inline void LinkSSend(u16){}
+inline void LinkUpdate(int){}
 #endif