From 6bee9b021d3f5ce8626d6b8bad375852e6ac651e Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Mon, 1 Jul 2013 17:57:11 +1000
Subject: [PATCH] Entire project now builds using the local version of SDL_net

---
 client/makefile                       | 6 +++---
 libs/Codebase/makefile                | 2 +-
 libs/Codebase/udp_network_utility.hpp | 2 +-
 libs/common/client_entry.hpp          | 2 +-
 libs/common/makefile                  | 4 ++--
 libs/common/packet.hpp                | 2 +-
 libs/common/server_entry.hpp          | 2 +-
 libs/makefile                         | 3 ++-
 server/makefile                       | 6 +++---
 test/foobar.cpp                       | 1 -
 test/foobar.hpp                       | 6 ------
 test/main.cpp                         | 3 ---
 test/makefile                         | 6 +++---
 13 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 test/foobar.cpp
 delete mode 100644 test/foobar.hpp

diff --git a/client/makefile b/client/makefile
index 2453d92..77148ae 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,8 +1,8 @@
 #config
 LIBDIR=../libs
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
-LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
-INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a $(LIBDIR)/out/libSDL_net.a
+LIB=$(LOCALLIBS) -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
+INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase $(LIBDIR)/common
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/libs/Codebase/makefile b/libs/Codebase/makefile
index 1b295ba..3356a71 100644
--- a/libs/Codebase/makefile
+++ b/libs/Codebase/makefile
@@ -2,7 +2,7 @@
 LIBDIR=..
 LOCALLIBS=
 LIB=
-INCLUDES=
+INCLUDES=$(LIBDIR)/SDL_net
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/libs/Codebase/udp_network_utility.hpp b/libs/Codebase/udp_network_utility.hpp
index dbd752e..7643e29 100644
--- a/libs/Codebase/udp_network_utility.hpp
+++ b/libs/Codebase/udp_network_utility.hpp
@@ -22,7 +22,7 @@
 #ifndef UDPNETWORKUTILITY_HPP_
 #define UDPNETWORKUTILITY_HPP_
 
-#include "SDL_net/SDL_net.h"
+#include "SDL_net.h"
 
 class UDPNetworkUtility {
 public:
diff --git a/libs/common/client_entry.hpp b/libs/common/client_entry.hpp
index ae2c1a9..1dd3604 100644
--- a/libs/common/client_entry.hpp
+++ b/libs/common/client_entry.hpp
@@ -22,7 +22,7 @@
 #ifndef CLIENTENTRY_HPP_
 #define CLIENTENTRY_HPP_
 
-#include "SDL_net/SDL_net.h"
+#include "SDL_net.h"
 
 struct ClientEntry {
 	int index;
diff --git a/libs/common/makefile b/libs/common/makefile
index 4fc582d..2bd54c1 100644
--- a/libs/common/makefile
+++ b/libs/common/makefile
@@ -1,8 +1,8 @@
 #config
 LIBDIR=..
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a
+LOCALLIBS=
 LIB=
-INCLUDES=$(LIBDIR)/Codebase
+INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/libs/common/packet.hpp b/libs/common/packet.hpp
index 89e479f..83948ab 100644
--- a/libs/common/packet.hpp
+++ b/libs/common/packet.hpp
@@ -24,7 +24,7 @@
 
 #include "vector2.hpp"
 
-#include "SDL_net/SDL_net.h"
+#include "SDL_net.h"
 
 #define PACKET_STRING_SIZE 100
 
diff --git a/libs/common/server_entry.hpp b/libs/common/server_entry.hpp
index af414ca..8ff8410 100644
--- a/libs/common/server_entry.hpp
+++ b/libs/common/server_entry.hpp
@@ -22,7 +22,7 @@
 #ifndef SERVERENTRY_HPP_
 #define SERVERENTRY_HPP_
 
-#include "SDL_net/SDL_net.h"
+#include "SDL_net.h"
 
 #include <string>
 
diff --git a/libs/makefile b/libs/makefile
index 8075f4d..19ea74a 100644
--- a/libs/makefile
+++ b/libs/makefile
@@ -1,7 +1,8 @@
 OUTDIR=out
 
 all: $(OUTDIR)
-	$(MAKE) -C codebase
+	$(MAKE) -C SDL_net
+	$(MAKE) -C Codebase
 	$(MAKE) -C common
 
 $(OUTDIR):
diff --git a/server/makefile b/server/makefile
index d6b2efb..754d45f 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,8 +1,8 @@
 #config
 LIBDIR=../libs
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
-LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
-INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
+LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a $(LIBDIR)/out/libSDL_net.a
+LIB=$(LOCALLIBS) -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
+INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase $(LIBDIR)/common
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source
diff --git a/test/foobar.cpp b/test/foobar.cpp
deleted file mode 100644
index abbd4b3..0000000
--- a/test/foobar.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "foobar.hpp"
diff --git a/test/foobar.hpp b/test/foobar.hpp
deleted file mode 100644
index 2a21514..0000000
--- a/test/foobar.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef FOOBAR_HPP_
-#define FOOBAR_HPP_
-
-int FooBar();
-
-#endif
diff --git a/test/main.cpp b/test/main.cpp
index 0b82642..3092780 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,10 +1,7 @@
-#include "packet.hpp"
-
 #include <iostream>
 
 using namespace std;
 
 int main(int, char**) {
-	Packet p;
 	return 0;
 }
\ No newline at end of file
diff --git a/test/makefile b/test/makefile
index 4336111..a7bce2d 100644
--- a/test/makefile
+++ b/test/makefile
@@ -1,8 +1,8 @@
 #config
 LIBDIR=../libs
-LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a
-LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
-INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common
+LOCALLIBS=
+LIB=
+INCLUDES=
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 
 #source