diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-20 12:23:02 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-21 10:32:11 -0700 |
| commit | a3c885e41bc188051f8918f090be998469018bca (patch) | |
| tree | ccf891b900a52ed8146732f216c2d091996cb0b2 /src/map | |
| parent | 91669aba40ce744f2d759c430537c94f23ec9fc2 (diff) | |
| download | tmwa-a3c885e41bc188051f8918f090be998469018bca.tar.gz tmwa-a3c885e41bc188051f8918f090be998469018bca.tar.bz2 tmwa-a3c885e41bc188051f8918f090be998469018bca.tar.xz tmwa-a3c885e41bc188051f8918f090be998469018bca.zip | |
Use the One Makefile to build them all
This changes the names of the built binaries:
login-server -> tmwa-login
char-server -> tmwa-char
map-server -> tmwa-map
ladmin -> tmwa-admin
eathena-monitor -> tmwa-monitor
It also gets rid of the 'deps.make' file.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/GNUmakefile | 4 | ||||
| -rw-r--r-- | src/map/magic-interpreter-base.cpp | 2 | ||||
| -rw-r--r-- | src/map/magic-interpreter-base.hpp | 1 | ||||
| -rw-r--r-- | src/map/magic-interpreter-lexer.hpp | 1 | ||||
| -rw-r--r-- | src/map/magic-interpreter-lexer.lpp | 2 | ||||
| -rw-r--r-- | src/map/magic-stmt.cpp | 2 | ||||
| -rw-r--r-- | src/map/magic-stmt.hpp | 1 | ||||
| -rw-r--r-- | src/map/magic.cpp | 8 | ||||
| -rw-r--r-- | src/map/main.cpp | 2 | ||||
| -rw-r--r-- | src/map/skill-pools.hpp | 1 | ||||
| -rw-r--r-- | src/map/skill.hpp | 1 |
11 files changed, 23 insertions, 2 deletions
diff --git a/src/map/GNUmakefile b/src/map/GNUmakefile index 0945926..22f6daa 100644 --- a/src/map/GNUmakefile +++ b/src/map/GNUmakefile @@ -1,6 +1,6 @@ .SUFFIXES: -all: - ${MAKE} -C ../.. map-server +bin/tmwa-map: + ${MAKE} -C ../.. bin/tmwa-map clean: rm -r ../../obj/map/ %:: diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp index 1a80617..3167efb 100644 --- a/src/map/magic-interpreter-base.cpp +++ b/src/map/magic-interpreter-base.cpp @@ -1,3 +1,5 @@ +#include "magic-interpreter-base.hpp" + #include "magic-interpreter-aux.hpp" #include "magic-interpreter.hpp" diff --git a/src/map/magic-interpreter-base.hpp b/src/map/magic-interpreter-base.hpp new file mode 100644 index 0000000..8c7e195 --- /dev/null +++ b/src/map/magic-interpreter-base.hpp @@ -0,0 +1 @@ +// dummy header to make Make dependencies work diff --git a/src/map/magic-interpreter-lexer.hpp b/src/map/magic-interpreter-lexer.hpp new file mode 100644 index 0000000..8c7e195 --- /dev/null +++ b/src/map/magic-interpreter-lexer.hpp @@ -0,0 +1 @@ +// dummy header to make Make dependencies work diff --git a/src/map/magic-interpreter-lexer.lpp b/src/map/magic-interpreter-lexer.lpp index a7c25e5..b5a16b2 100644 --- a/src/map/magic-interpreter-lexer.lpp +++ b/src/map/magic-interpreter-lexer.lpp @@ -1,4 +1,6 @@ %{ +#include "magic-interpreter-lexer.hpp" +# #include "magic-interpreter-parser.hpp" #include "../common/cxxstdio.hpp" diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index 6b013ab..12fed6e 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -1,3 +1,5 @@ +#include "magic-stmt.hpp" + #include <cassert> #include "../common/cxxstdio.hpp" diff --git a/src/map/magic-stmt.hpp b/src/map/magic-stmt.hpp new file mode 100644 index 0000000..8c7e195 --- /dev/null +++ b/src/map/magic-stmt.hpp @@ -0,0 +1 @@ +// dummy header to make Make dependencies work diff --git a/src/map/magic.cpp b/src/map/magic.cpp index 9c07dd1..b6dc806 100644 --- a/src/map/magic.cpp +++ b/src/map/magic.cpp @@ -3,8 +3,16 @@ #include "../common/cxxstdio.hpp" #include "magic-interpreter.hpp" + #include "pc.hpp" +#include "magic-expr.hpp" +#include "magic-interpreter-base.hpp" +#include "magic-interpreter-lexer.hpp" +#include "magic-interpreter-parser.hpp" +#include "magic-stmt.hpp" +#include "magic.hpp" + #include "../poison.hpp" #undef DEBUG diff --git a/src/map/main.cpp b/src/map/main.cpp new file mode 100644 index 0000000..c930630 --- /dev/null +++ b/src/map/main.cpp @@ -0,0 +1,2 @@ +// dummy file to make Make dependencies work +#include "map.hpp" diff --git a/src/map/skill-pools.hpp b/src/map/skill-pools.hpp new file mode 100644 index 0000000..8c7e195 --- /dev/null +++ b/src/map/skill-pools.hpp @@ -0,0 +1 @@ +// dummy header to make Make dependencies work diff --git a/src/map/skill.hpp b/src/map/skill.hpp index bcd0261..a233ed4 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -2,6 +2,7 @@ #define SKILL_HPP #include "skill.t.hpp" +#include "skill-pools.hpp" #include "../common/strings.hpp" |