Entire project now builds using the local version of SDL_net

This commit is contained in:
Kayne Ruse
2013-07-01 17:57:11 +10:00
parent 2089105695
commit 6bee9b021d
13 changed files with 18 additions and 27 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
LIBDIR=..
LOCALLIBS=
LIB=
INCLUDES=
INCLUDES=$(LIBDIR)/SDL_net
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef UDPNETWORKUTILITY_HPP_
#define UDPNETWORKUTILITY_HPP_
#include "SDL_net/SDL_net.h"
#include "SDL_net.h"
class UDPNetworkUtility {
public:
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef CLIENTENTRY_HPP_
#define CLIENTENTRY_HPP_
#include "SDL_net/SDL_net.h"
#include "SDL_net.h"
struct ClientEntry {
int index;
+2 -2
View File
@@ -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
+1 -1
View File
@@ -24,7 +24,7 @@
#include "vector2.hpp"
#include "SDL_net/SDL_net.h"
#include "SDL_net.h"
#define PACKET_STRING_SIZE 100
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef SERVERENTRY_HPP_
#define SERVERENTRY_HPP_
#include "SDL_net/SDL_net.h"
#include "SDL_net.h"
#include <string>
+2 -1
View File
@@ -1,7 +1,8 @@
OUTDIR=out
all: $(OUTDIR)
$(MAKE) -C codebase
$(MAKE) -C SDL_net
$(MAKE) -C Codebase
$(MAKE) -C common
$(OUTDIR):