Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Kayne Ruse
2013-07-01 18:14:55 +10:00
parent a49b0eb1fe 6bee9b021d
commit b7205c278a
13 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/makefile
+3 -3
View File
@@ -1,8 +1,8 @@
#config #config
LIBDIR=../libs LIBDIR=../libs
LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a $(LIBDIR)/out/libSDL_net.a
LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL LIB=$(LOCALLIBS) -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase $(LIBDIR)/common
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source #source
libs/Codebase/makefile
+1 -1
View File
@@ -2,7 +2,7 @@
LIBDIR=.. LIBDIR=..
LOCALLIBS= LOCALLIBS=
LIB= LIB=
INCLUDES= INCLUDES=$(LIBDIR)/SDL_net
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source #source
libs/Codebase/udp_network_utility.hpp
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef UDPNETWORKUTILITY_HPP_ #ifndef UDPNETWORKUTILITY_HPP_
#define UDPNETWORKUTILITY_HPP_ #define UDPNETWORKUTILITY_HPP_
#include "SDL_net/SDL_net.h" #include "SDL_net.h"
class UDPNetworkUtility { class UDPNetworkUtility {
public: public:
libs/common/client_entry.hpp
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef CLIENTENTRY_HPP_ #ifndef CLIENTENTRY_HPP_
#define CLIENTENTRY_HPP_ #define CLIENTENTRY_HPP_
#include "SDL_net/SDL_net.h" #include "SDL_net.h"
struct ClientEntry { struct ClientEntry {
int index; int index;
libs/common/makefile
+2 -2
View File
@@ -1,8 +1,8 @@
#config #config
LIBDIR=.. LIBDIR=..
LOCALLIBS=$(LIBDIR)/out/libCodebase.a LOCALLIBS=
LIB= LIB=
INCLUDES=$(LIBDIR)/Codebase INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source #source
libs/common/packet.hpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include "vector2.hpp" #include "vector2.hpp"
#include "SDL_net/SDL_net.h" #include "SDL_net.h"
#define PACKET_STRING_SIZE 100 #define PACKET_STRING_SIZE 100
libs/common/server_entry.hpp
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef SERVERENTRY_HPP_ #ifndef SERVERENTRY_HPP_
#define SERVERENTRY_HPP_ #define SERVERENTRY_HPP_
#include "SDL_net/SDL_net.h" #include "SDL_net.h"
#include <string> #include <string>
libs/makefile
+2 -1
View File
@@ -1,7 +1,8 @@
OUTDIR=out OUTDIR=out
all: $(OUTDIR) all: $(OUTDIR)
$(MAKE) -C codebase $(MAKE) -C SDL_net
$(MAKE) -C Codebase
$(MAKE) -C common $(MAKE) -C common
$(OUTDIR): $(OUTDIR):
server/makefile
+3 -3
View File
@@ -1,8 +1,8 @@
#config #config
LIBDIR=../libs LIBDIR=../libs
LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a $(LIBDIR)/out/libSDL_net.a
LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL LIB=$(LOCALLIBS) -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL
INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common INCLUDES=$(LIBDIR)/SDL_net $(LIBDIR)/Codebase $(LIBDIR)/common
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source #source
test/foobar.cpp
-1
View File
@@ -1 +0,0 @@
#include "foobar.hpp"
test/foobar.hpp
-6
View File
@@ -1,6 +0,0 @@
#ifndef FOOBAR_HPP_
#define FOOBAR_HPP_
int FooBar();
#endif
test/main.cpp
-3
View File
@@ -1,10 +1,7 @@
#include "packet.hpp"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
int main(int, char**) { int main(int, char**) {
Packet p;
return 0; return 0;
} }
test/makefile
+3 -3
View File
@@ -1,8 +1,8 @@
#config #config
LIBDIR=../libs LIBDIR=../libs
LOCALLIBS=$(LIBDIR)/out/libCodebase.a $(LIBDIR)/out/libCommon.a LOCALLIBS=
LIB=$(LOCALLIBS) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL LIB=
INCLUDES=$(LIBDIR)/Codebase $(LIBDIR)/common INCLUDES=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source #source