diff options
| -rw-r--r-- | .gitignore | 22 | ||||
| -rw-r--r-- | SConstruct (renamed from server/SConstruct) | 2 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | src/client.cpp (renamed from server/client.cpp) | 0 | ||||
| -rw-r--r-- | src/client.h (renamed from server/client.h) | 0 | ||||
| -rw-r--r-- | src/connection.cpp (renamed from server/connection.cpp) | 0 | ||||
| -rw-r--r-- | src/connection.h (renamed from server/connection.h) | 0 | ||||
| -rw-r--r-- | src/game.cpp (renamed from server/game.cpp) | 0 | ||||
| -rw-r--r-- | src/game.h (renamed from server/game.h) | 0 | ||||
| -rw-r--r-- | src/hand.cpp (renamed from server/hand.cpp) | 0 | ||||
| -rw-r--r-- | src/hand.h (renamed from server/hand.h) | 0 | ||||
| -rw-r--r-- | src/lobby.cpp (renamed from server/lobby.cpp) | 0 | ||||
| -rw-r--r-- | src/lobby.h (renamed from server/lobby.h) | 0 | ||||
| -rw-r--r-- | src/main.cpp (renamed from server/main.cpp) | 0 | ||||
| -rw-r--r-- | src/player.cpp (renamed from server/player.cpp) | 0 | ||||
| -rw-r--r-- | src/player.h (renamed from server/player.h) | 0 | ||||
| -rw-r--r-- | src/score.cpp (renamed from server/score.cpp) | 0 | ||||
| -rw-r--r-- | src/score.h (renamed from server/score.h) | 0 | ||||
| -rw-r--r-- | src/tcpserver.cpp (renamed from server/tcpserver.cpp) | 0 | ||||
| -rw-r--r-- | src/tcpserver.h (renamed from server/tcpserver.h) | 0 | ||||
| -rw-r--r-- | src/wall.cpp (renamed from server/wall.cpp) | 0 | ||||
| -rw-r--r-- | src/wall.h (renamed from server/wall.h) | 0 | ||||
| -rw-r--r-- | tests/SConscript (renamed from server/tests/SConscript) | 2 | ||||
| -rw-r--r-- | tests/calculate_score.cpp (renamed from server/tests/calculate_score.cpp) | 2 | ||||
| -rw-r--r-- | tests/test_framework.cpp (renamed from server/tests/test_framework.cpp) | 0 |
25 files changed, 6 insertions, 22 deletions
@@ -1,22 +1,6 @@ *.o .sconsign.dblite -client/aotenjou -server/aotenjoud -*.test -*.passed - -*.suo -*.depend -*.layout -*.cbp -*.save -*.cbTemp -*.workspace - -doc/client/ +aotenjoud +tests/*.test +tests/*.passed doc/server/ - -client/bin/* -client/obj/* -server/bin/* -server/obj/* diff --git a/server/SConstruct b/SConstruct index 09f34c7..7b883e0 100644 --- a/server/SConstruct +++ b/SConstruct @@ -23,7 +23,7 @@ if GetOption('profiling'): Export('env') -env.Program('aotenjoud', Glob('*.cpp') + Glob('../common/*.cpp')) +env.Program('aotenjoud', Glob('src/*.cpp') + Glob('common/*.cpp')) env.SConscript('tests/SConscript') diff --git a/common b/common -Subproject dd64a35c949738c2c321989d065e0754556823d +Subproject 2b14831ac8bdb4b8b8845cf78673105f0fa157a diff --git a/server/client.cpp b/src/client.cpp index afec605..afec605 100644 --- a/server/client.cpp +++ b/src/client.cpp diff --git a/server/client.h b/src/client.h index e6cfcc7..e6cfcc7 100644 --- a/server/client.h +++ b/src/client.h diff --git a/server/connection.cpp b/src/connection.cpp index 1e38f7b..1e38f7b 100644 --- a/server/connection.cpp +++ b/src/connection.cpp diff --git a/server/connection.h b/src/connection.h index b51a67f..b51a67f 100644 --- a/server/connection.h +++ b/src/connection.h diff --git a/server/game.cpp b/src/game.cpp index e791379..e791379 100644 --- a/server/game.cpp +++ b/src/game.cpp diff --git a/server/game.h b/src/game.h index 874a525..874a525 100644 --- a/server/game.h +++ b/src/game.h diff --git a/server/hand.cpp b/src/hand.cpp index bc4fb7a..bc4fb7a 100644 --- a/server/hand.cpp +++ b/src/hand.cpp diff --git a/server/hand.h b/src/hand.h index b7ae8d2..b7ae8d2 100644 --- a/server/hand.h +++ b/src/hand.h diff --git a/server/lobby.cpp b/src/lobby.cpp index 9fb769e..9fb769e 100644 --- a/server/lobby.cpp +++ b/src/lobby.cpp diff --git a/server/lobby.h b/src/lobby.h index c445506..c445506 100644 --- a/server/lobby.h +++ b/src/lobby.h diff --git a/server/main.cpp b/src/main.cpp index 207d6d6..207d6d6 100644 --- a/server/main.cpp +++ b/src/main.cpp diff --git a/server/player.cpp b/src/player.cpp index a267b1d..a267b1d 100644 --- a/server/player.cpp +++ b/src/player.cpp diff --git a/server/player.h b/src/player.h index a4b3416..a4b3416 100644 --- a/server/player.h +++ b/src/player.h diff --git a/server/score.cpp b/src/score.cpp index 7d0dc41..7d0dc41 100644 --- a/server/score.cpp +++ b/src/score.cpp diff --git a/server/score.h b/src/score.h index 6dee09a..6dee09a 100644 --- a/server/score.h +++ b/src/score.h diff --git a/server/tcpserver.cpp b/src/tcpserver.cpp index 3f34997..3f34997 100644 --- a/server/tcpserver.cpp +++ b/src/tcpserver.cpp diff --git a/server/tcpserver.h b/src/tcpserver.h index 47c5056..47c5056 100644 --- a/server/tcpserver.h +++ b/src/tcpserver.h diff --git a/server/wall.cpp b/src/wall.cpp index 42df094..42df094 100644 --- a/server/wall.cpp +++ b/src/wall.cpp diff --git a/server/wall.h b/src/wall.h index aeef031..aeef031 100644 --- a/server/wall.h +++ b/src/wall.h diff --git a/server/tests/SConscript b/tests/SConscript index b6c3bea..bba628c 100644 --- a/server/tests/SConscript +++ b/tests/SConscript @@ -8,4 +8,4 @@ test_bld = Builder( env.Append(BUILDERS = {'Test' : test_bld}) env.Test('calculate_score', ['calculate_score.cpp', 'test_framework.cpp', - '../player.cpp', '../client.cpp', '../connection.cpp', '../hand.cpp', '../score.cpp'] + Glob('../../common/*.cpp')) + '../src/player.cpp', '../src/client.cpp', '../src/connection.cpp', '../src/hand.cpp', '../src/score.cpp'] + Glob('../common/*.cpp')) diff --git a/server/tests/calculate_score.cpp b/tests/calculate_score.cpp index b78e763..3555f01 100644 --- a/server/tests/calculate_score.cpp +++ b/tests/calculate_score.cpp @@ -4,7 +4,7 @@ #include <boost/assign/list_of.hpp> using boost::assign::list_of; -#include "../player.h" +#include "../src/player.h" BOOST_AUTO_TEST_CASE(tsumo_tanyao) { Player player; diff --git a/server/tests/test_framework.cpp b/tests/test_framework.cpp index 67373e9..67373e9 100644 --- a/server/tests/test_framework.cpp +++ b/tests/test_framework.cpp |