src/music/mngfile.cpp src/music/mngfile.h src/music/mnglexer.re2c src/music/mngparser.ypp @@ -100,7 +100,7 @@ SET(OPENC2E_CORE src/Map.cpp src/MetaRoom.cpp src/mmapifstream.cpp - src/mngfile.cpp + src/music/mngfile.cpp ${GEN}/mngparser.tab.cpp src/MusicManager.cpp src/oldBrain.cpp @@ -339,28 +339,16 @@ ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND( OUTPUT ${GEN}/mnglexer.cpp - COMMAND re2c -o ${GEN}/mnglexer.cpp ${SRC}/src/mnglexer.re2c - DEPENDS ${SRC}/src/mnglexer.re2c + COMMAND re2c -o ${GEN}/mnglexer.cpp ${SRC}/src/music/mnglexer.re2c + DEPENDS ${SRC}/src/music/mnglexer.re2c WORKING_DIRECTORY ${SRC}) ADD_CUSTOM_COMMAND( OUTPUT ${GEN}/mngparser.tab.cpp ${GEN}/mngparser.tab.hpp - COMMAND bison -d --name-prefix=mng --file-prefix="${GEN}/mngparser" src/mngparser.ypp - DEPENDS src/mngparser.ypp + COMMAND bison -d --name-prefix=mng --file-prefix="${GEN}/mngparser" src/music/mngparser.ypp + DEPENDS src/music/mngparser.ypp WORKING_DIRECTORY ${SRC}) -#ADD_CUSTOM_COMMAND( -# OUTPUT ${GEN}/lex.mng.cpp ${GEN}/lex.mng.h -# COMMAND flex -+ --prefix=mng -d -o ${GEN}/lex.mng.cpp --header-file=${GEN}/lex.mng.h mng.l -# DEPENDS mng.l -# WORKING_DIRECTORY ${SRC}) -# -#ADD_CUSTOM_COMMAND( -# OUTPUT ${GEN}/mngparser.tab.cpp ${GEN}/mngparser.tab.hpp -# COMMAND bison -d --name-prefix=mng --file-prefix="${GEN}/mngparser" mngparser.ypp -# DEPENDS mngparser.ypp -# WORKING_DIRECTORY ${SRC}) - ADD_CUSTOM_TARGET(test DEPENDS openc2e COMMAND perl ${SRC}/runtests.pl ${SRC}/tests) ADD_CUSTOM_TARGET(docs ALL DEPENDS ${BIN}/caosdocs.html ${BIN}/docs.css ${BIN}/openc2e.6) @@ -371,7 +359,5 @@ ADD_CUSTOM_TARGET(generated DEPENDS ${GEN}/mnglexer.cpp ${GEN}/cataloglexer.cpp ${GEN}/cmddata.cpp - # ${GEN}/lex.mng.cpp ${GEN}/lex.mng.h - # ${GEN}/mngparser.tab.cpp ${GEN}/mngparser.tab.hpp ) CMakeLists.txt @@ -20,7 +20,7 @@ #ifndef _MUSICMANAGER_H #define _MUSICMANAGER_H -#include "mngfile.h" +#include "music/mngfile.h" class MusicManager { private: src/MusicManager.h src/mngfile.cpp src/mngfile.h src/mnglexer.re2c src/mngparser.ypp ea6fcfd9ab7ad17f38fb0cee77f3c090e7141ad9 Alyssa Milburn fuzzie@fuzzie.org http://github.com/ccdevnet/openc2e/commit/c65c6e71d58b16ca2f3b9cc69e8f2177d5e6d208 c65c6e71d58b16ca2f3b9cc69e8f2177d5e6d208 2008-11-03T11:47:02-08:00 2008-11-03T11:47:02-08:00 move mng stuff into src/music/ 94b4257ca74413f2e39d1ecc4b71d6ca32f43954 Alyssa Milburn fuzzie@fuzzie.org