diff --git a/.gitignore b/.gitignore index 074a92a3978..07b62271abb 100644 --- a/.gitignore +++ b/.gitignore @@ -90,20 +90,20 @@ lib*.a /test/runner.cpp /test/*.dSYM -/tools/convbdf -/tools/md5table -/tools/make-scumm-fontdata -/tools/create_drascula/create_drascula -/tools/create_hugo/create_hugo -/tools/create_kyradat/create_kyradat -/tools/create_lure/create_lure -/tools/create_mads/create_mads -/tools/create_project/create_project -/tools/create_teenagent/create_teenagent -/tools/create_toon/create_toon -/tools/create_translations/create_translations -/tools/qtable/qtable -/tools/skycpt/skycpt +/devtools/convbdf +/devtools/md5table +/devtools/make-scumm-fontdata +/devtools/create_drascula/create_drascula +/devtools/create_hugo/create_hugo +/devtools/create_kyradat/create_kyradat +/devtools/create_lure/create_lure +/devtools/create_mads/create_mads +/devtools/create_project/create_project +/devtools/create_teenagent/create_teenagent +/devtools/create_toon/create_toon +/devtools/create_translations/create_translations +/devtools/qtable/qtable +/devtools/skycpt/skycpt #ignore thumbnails created by windows Thumbs.db diff --git a/Makefile.common b/Makefile.common index 2413fa572b6..6646af8e8d8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -16,7 +16,7 @@ all: $(EXECUTABLE) plugins ###################################################################### PLUGINS := -MODULES := test tools base $(MODULES) +MODULES := test devtools base $(MODULES) -include $(srcdir)/engines/engines.mk diff --git a/tools/README b/devtools/README similarity index 100% rename from tools/README rename to devtools/README diff --git a/tools/agi-palex.py b/devtools/agi-palex.py similarity index 100% rename from tools/agi-palex.py rename to devtools/agi-palex.py diff --git a/tools/construct-pred-dict.pl b/devtools/construct-pred-dict.pl similarity index 100% rename from tools/construct-pred-dict.pl rename to devtools/construct-pred-dict.pl diff --git a/tools/convbdf.c b/devtools/convbdf.c similarity index 100% rename from tools/convbdf.c rename to devtools/convbdf.c diff --git a/tools/create_drascula/Makefile b/devtools/create_drascula/Makefile similarity index 100% rename from tools/create_drascula/Makefile rename to devtools/create_drascula/Makefile diff --git a/tools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp similarity index 100% rename from tools/create_drascula/create_drascula.cpp rename to devtools/create_drascula/create_drascula.cpp diff --git a/tools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h similarity index 100% rename from tools/create_drascula/create_drascula.h rename to devtools/create_drascula/create_drascula.h diff --git a/tools/create_drascula/dists/msvc8/create_drascula.sln b/devtools/create_drascula/dists/msvc8/create_drascula.sln similarity index 100% rename from tools/create_drascula/dists/msvc8/create_drascula.sln rename to devtools/create_drascula/dists/msvc8/create_drascula.sln diff --git a/tools/create_drascula/dists/msvc8/create_drascula.vcproj b/devtools/create_drascula/dists/msvc8/create_drascula.vcproj similarity index 100% rename from tools/create_drascula/dists/msvc8/create_drascula.vcproj rename to devtools/create_drascula/dists/msvc8/create_drascula.vcproj diff --git a/tools/create_drascula/dists/msvc8_to_msvc9.bat b/devtools/create_drascula/dists/msvc8_to_msvc9.bat similarity index 100% rename from tools/create_drascula/dists/msvc8_to_msvc9.bat rename to devtools/create_drascula/dists/msvc8_to_msvc9.bat diff --git a/tools/create_drascula/dists/msvc9/create_drascula.sln b/devtools/create_drascula/dists/msvc9/create_drascula.sln similarity index 100% rename from tools/create_drascula/dists/msvc9/create_drascula.sln rename to devtools/create_drascula/dists/msvc9/create_drascula.sln diff --git a/tools/create_drascula/dists/msvc9/create_drascula.vcproj b/devtools/create_drascula/dists/msvc9/create_drascula.vcproj similarity index 100% rename from tools/create_drascula/dists/msvc9/create_drascula.vcproj rename to devtools/create_drascula/dists/msvc9/create_drascula.vcproj diff --git a/tools/create_drascula/dists/msvc9_to_msvc8.bat b/devtools/create_drascula/dists/msvc9_to_msvc8.bat similarity index 100% rename from tools/create_drascula/dists/msvc9_to_msvc8.bat rename to devtools/create_drascula/dists/msvc9_to_msvc8.bat diff --git a/tools/create_drascula/module.mk b/devtools/create_drascula/module.mk similarity index 83% rename from tools/create_drascula/module.mk rename to devtools/create_drascula/module.mk index 3d648719601..b5a32d8d00c 100644 --- a/tools/create_drascula/module.mk +++ b/devtools/create_drascula/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_drascula +MODULE := devtools/create_drascula MODULE_OBJS := \ create_drascula.o diff --git a/tools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h similarity index 100% rename from tools/create_drascula/staticdata.h rename to devtools/create_drascula/staticdata.h diff --git a/tools/create_hugo/Data/Btn_1.bmp b/devtools/create_hugo/Data/Btn_1.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_1.bmp rename to devtools/create_hugo/Data/Btn_1.bmp diff --git a/tools/create_hugo/Data/Btn_1_off.bmp b/devtools/create_hugo/Data/Btn_1_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_1_off.bmp rename to devtools/create_hugo/Data/Btn_1_off.bmp diff --git a/tools/create_hugo/Data/Btn_2.bmp b/devtools/create_hugo/Data/Btn_2.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_2.bmp rename to devtools/create_hugo/Data/Btn_2.bmp diff --git a/tools/create_hugo/Data/Btn_2_off.bmp b/devtools/create_hugo/Data/Btn_2_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_2_off.bmp rename to devtools/create_hugo/Data/Btn_2_off.bmp diff --git a/tools/create_hugo/Data/Btn_3.bmp b/devtools/create_hugo/Data/Btn_3.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_3.bmp rename to devtools/create_hugo/Data/Btn_3.bmp diff --git a/tools/create_hugo/Data/Btn_3_off.bmp b/devtools/create_hugo/Data/Btn_3_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_3_off.bmp rename to devtools/create_hugo/Data/Btn_3_off.bmp diff --git a/tools/create_hugo/Data/Btn_4.bmp b/devtools/create_hugo/Data/Btn_4.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_4.bmp rename to devtools/create_hugo/Data/Btn_4.bmp diff --git a/tools/create_hugo/Data/Btn_4_off.bmp b/devtools/create_hugo/Data/Btn_4_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_4_off.bmp rename to devtools/create_hugo/Data/Btn_4_off.bmp diff --git a/tools/create_hugo/Data/Btn_5.bmp b/devtools/create_hugo/Data/Btn_5.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_5.bmp rename to devtools/create_hugo/Data/Btn_5.bmp diff --git a/tools/create_hugo/Data/Btn_5_off.bmp b/devtools/create_hugo/Data/Btn_5_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_5_off.bmp rename to devtools/create_hugo/Data/Btn_5_off.bmp diff --git a/tools/create_hugo/Data/Btn_6.bmp b/devtools/create_hugo/Data/Btn_6.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_6.bmp rename to devtools/create_hugo/Data/Btn_6.bmp diff --git a/tools/create_hugo/Data/Btn_6_off.bmp b/devtools/create_hugo/Data/Btn_6_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_6_off.bmp rename to devtools/create_hugo/Data/Btn_6_off.bmp diff --git a/tools/create_hugo/Data/Btn_7.bmp b/devtools/create_hugo/Data/Btn_7.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_7.bmp rename to devtools/create_hugo/Data/Btn_7.bmp diff --git a/tools/create_hugo/Data/Btn_7_off.bmp b/devtools/create_hugo/Data/Btn_7_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_7_off.bmp rename to devtools/create_hugo/Data/Btn_7_off.bmp diff --git a/tools/create_hugo/Data/Btn_8.bmp b/devtools/create_hugo/Data/Btn_8.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_8.bmp rename to devtools/create_hugo/Data/Btn_8.bmp diff --git a/tools/create_hugo/Data/Btn_8_off.bmp b/devtools/create_hugo/Data/Btn_8_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_8_off.bmp rename to devtools/create_hugo/Data/Btn_8_off.bmp diff --git a/tools/create_hugo/Data/Btn_9.bmp b/devtools/create_hugo/Data/Btn_9.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_9.bmp rename to devtools/create_hugo/Data/Btn_9.bmp diff --git a/tools/create_hugo/Data/Btn_9_off.bmp b/devtools/create_hugo/Data/Btn_9_off.bmp similarity index 100% rename from tools/create_hugo/Data/Btn_9_off.bmp rename to devtools/create_hugo/Data/Btn_9_off.bmp diff --git a/tools/create_hugo/README b/devtools/create_hugo/README similarity index 100% rename from tools/create_hugo/README rename to devtools/create_hugo/README diff --git a/tools/create_hugo/create_hugo.cpp b/devtools/create_hugo/create_hugo.cpp similarity index 100% rename from tools/create_hugo/create_hugo.cpp rename to devtools/create_hugo/create_hugo.cpp diff --git a/tools/create_hugo/create_hugo.h b/devtools/create_hugo/create_hugo.h similarity index 100% rename from tools/create_hugo/create_hugo.h rename to devtools/create_hugo/create_hugo.h diff --git a/tools/create_hugo/dists/msvc10/create_hugo.sln b/devtools/create_hugo/dists/msvc10/create_hugo.sln similarity index 100% rename from tools/create_hugo/dists/msvc10/create_hugo.sln rename to devtools/create_hugo/dists/msvc10/create_hugo.sln diff --git a/tools/create_hugo/dists/msvc10/create_hugo.vcxproj b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj similarity index 100% rename from tools/create_hugo/dists/msvc10/create_hugo.vcxproj rename to devtools/create_hugo/dists/msvc10/create_hugo.vcxproj diff --git a/tools/create_hugo/dists/msvc9/create_hugo.sln b/devtools/create_hugo/dists/msvc9/create_hugo.sln similarity index 100% rename from tools/create_hugo/dists/msvc9/create_hugo.sln rename to devtools/create_hugo/dists/msvc9/create_hugo.sln diff --git a/tools/create_hugo/dists/msvc9/create_hugo.vcproj b/devtools/create_hugo/dists/msvc9/create_hugo.vcproj similarity index 100% rename from tools/create_hugo/dists/msvc9/create_hugo.vcproj rename to devtools/create_hugo/dists/msvc9/create_hugo.vcproj diff --git a/tools/create_hugo/enums.h b/devtools/create_hugo/enums.h similarity index 100% rename from tools/create_hugo/enums.h rename to devtools/create_hugo/enums.h diff --git a/tools/create_hugo/module.mk b/devtools/create_hugo/module.mk similarity index 82% rename from tools/create_hugo/module.mk rename to devtools/create_hugo/module.mk index 797ff3a1a01..ad7e833972c 100644 --- a/tools/create_hugo/module.mk +++ b/devtools/create_hugo/module.mk @@ -1,4 +1,4 @@ -MODULE := tools/create_hugo +MODULE := devtools/create_hugo MODULE_OBJS := \ create_hugo.o diff --git a/tools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h similarity index 100% rename from tools/create_hugo/staticdata.h rename to devtools/create_hugo/staticdata.h diff --git a/tools/create_hugo/staticdisplay.h b/devtools/create_hugo/staticdisplay.h similarity index 100% rename from tools/create_hugo/staticdisplay.h rename to devtools/create_hugo/staticdisplay.h diff --git a/tools/create_hugo/staticengine.h b/devtools/create_hugo/staticengine.h similarity index 100% rename from tools/create_hugo/staticengine.h rename to devtools/create_hugo/staticengine.h diff --git a/tools/create_hugo/staticfont.h b/devtools/create_hugo/staticfont.h similarity index 100% rename from tools/create_hugo/staticfont.h rename to devtools/create_hugo/staticfont.h diff --git a/tools/create_hugo/staticintro.h b/devtools/create_hugo/staticintro.h similarity index 100% rename from tools/create_hugo/staticintro.h rename to devtools/create_hugo/staticintro.h diff --git a/tools/create_hugo/staticmouse.h b/devtools/create_hugo/staticmouse.h similarity index 100% rename from tools/create_hugo/staticmouse.h rename to devtools/create_hugo/staticmouse.h diff --git a/tools/create_hugo/staticparser.h b/devtools/create_hugo/staticparser.h similarity index 100% rename from tools/create_hugo/staticparser.h rename to devtools/create_hugo/staticparser.h diff --git a/tools/create_hugo/staticutil.h b/devtools/create_hugo/staticutil.h similarity index 100% rename from tools/create_hugo/staticutil.h rename to devtools/create_hugo/staticutil.h diff --git a/tools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp similarity index 100% rename from tools/create_kyradat/create_kyradat.cpp rename to devtools/create_kyradat/create_kyradat.cpp diff --git a/tools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h similarity index 100% rename from tools/create_kyradat/create_kyradat.h rename to devtools/create_kyradat/create_kyradat.h diff --git a/tools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp similarity index 100% rename from tools/create_kyradat/extract.cpp rename to devtools/create_kyradat/extract.cpp diff --git a/tools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h similarity index 100% rename from tools/create_kyradat/extract.h rename to devtools/create_kyradat/extract.h diff --git a/tools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp similarity index 100% rename from tools/create_kyradat/games.cpp rename to devtools/create_kyradat/games.cpp diff --git a/tools/create_kyradat/md5.cpp b/devtools/create_kyradat/md5.cpp similarity index 100% rename from tools/create_kyradat/md5.cpp rename to devtools/create_kyradat/md5.cpp diff --git a/tools/create_kyradat/md5.h b/devtools/create_kyradat/md5.h similarity index 100% rename from tools/create_kyradat/md5.h rename to devtools/create_kyradat/md5.h diff --git a/tools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk similarity index 87% rename from tools/create_kyradat/module.mk rename to devtools/create_kyradat/module.mk index b10dbb33cb5..60cd1f8578f 100644 --- a/tools/create_kyradat/module.mk +++ b/devtools/create_kyradat/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_kyradat +MODULE := devtools/create_kyradat MODULE_OBJS := \ create_kyradat.o \ diff --git a/tools/create_kyradat/pak.cpp b/devtools/create_kyradat/pak.cpp similarity index 100% rename from tools/create_kyradat/pak.cpp rename to devtools/create_kyradat/pak.cpp diff --git a/tools/create_kyradat/pak.h b/devtools/create_kyradat/pak.h similarity index 100% rename from tools/create_kyradat/pak.h rename to devtools/create_kyradat/pak.h diff --git a/tools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp similarity index 100% rename from tools/create_kyradat/search.cpp rename to devtools/create_kyradat/search.cpp diff --git a/tools/create_kyradat/search.h b/devtools/create_kyradat/search.h similarity index 100% rename from tools/create_kyradat/search.h rename to devtools/create_kyradat/search.h diff --git a/tools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp similarity index 100% rename from tools/create_kyradat/tables.cpp rename to devtools/create_kyradat/tables.cpp diff --git a/tools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h similarity index 100% rename from tools/create_kyradat/tables.h rename to devtools/create_kyradat/tables.h diff --git a/tools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp similarity index 100% rename from tools/create_kyradat/util.cpp rename to devtools/create_kyradat/util.cpp diff --git a/tools/create_kyradat/util.h b/devtools/create_kyradat/util.h similarity index 100% rename from tools/create_kyradat/util.h rename to devtools/create_kyradat/util.h diff --git a/tools/create_lure/Makefile b/devtools/create_lure/Makefile similarity index 100% rename from tools/create_lure/Makefile rename to devtools/create_lure/Makefile diff --git a/tools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp similarity index 100% rename from tools/create_lure/create_lure_dat.cpp rename to devtools/create_lure/create_lure_dat.cpp diff --git a/tools/create_lure/create_lure_dat.h b/devtools/create_lure/create_lure_dat.h similarity index 100% rename from tools/create_lure/create_lure_dat.h rename to devtools/create_lure/create_lure_dat.h diff --git a/tools/create_lure/dists/msvc8/create_lure.sln b/devtools/create_lure/dists/msvc8/create_lure.sln similarity index 100% rename from tools/create_lure/dists/msvc8/create_lure.sln rename to devtools/create_lure/dists/msvc8/create_lure.sln diff --git a/tools/create_lure/dists/msvc8/create_lure.vcproj b/devtools/create_lure/dists/msvc8/create_lure.vcproj similarity index 100% rename from tools/create_lure/dists/msvc8/create_lure.vcproj rename to devtools/create_lure/dists/msvc8/create_lure.vcproj diff --git a/tools/create_lure/dists/msvc8_to_msvc9.bat b/devtools/create_lure/dists/msvc8_to_msvc9.bat similarity index 100% rename from tools/create_lure/dists/msvc8_to_msvc9.bat rename to devtools/create_lure/dists/msvc8_to_msvc9.bat diff --git a/tools/create_lure/dists/msvc9/create_lure.sln b/devtools/create_lure/dists/msvc9/create_lure.sln similarity index 100% rename from tools/create_lure/dists/msvc9/create_lure.sln rename to devtools/create_lure/dists/msvc9/create_lure.sln diff --git a/tools/create_lure/dists/msvc9/create_lure.vcproj b/devtools/create_lure/dists/msvc9/create_lure.vcproj similarity index 100% rename from tools/create_lure/dists/msvc9/create_lure.vcproj rename to devtools/create_lure/dists/msvc9/create_lure.vcproj diff --git a/tools/create_lure/dists/msvc9_to_msvc8.bat b/devtools/create_lure/dists/msvc9_to_msvc8.bat similarity index 100% rename from tools/create_lure/dists/msvc9_to_msvc8.bat rename to devtools/create_lure/dists/msvc9_to_msvc8.bat diff --git a/tools/create_lure/module.mk b/devtools/create_lure/module.mk similarity index 85% rename from tools/create_lure/module.mk rename to devtools/create_lure/module.mk index 04229b93775..5d8192cb7af 100644 --- a/tools/create_lure/module.mk +++ b/devtools/create_lure/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_lure +MODULE := devtools/create_lure MODULE_OBJS := \ create_lure_dat.o \ diff --git a/tools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp similarity index 100% rename from tools/create_lure/process_actions.cpp rename to devtools/create_lure/process_actions.cpp diff --git a/tools/create_mads/Makefile b/devtools/create_mads/Makefile similarity index 100% rename from tools/create_mads/Makefile rename to devtools/create_mads/Makefile diff --git a/tools/create_mads/dists/msvc9/create_mads.sln b/devtools/create_mads/dists/msvc9/create_mads.sln similarity index 100% rename from tools/create_mads/dists/msvc9/create_mads.sln rename to devtools/create_mads/dists/msvc9/create_mads.sln diff --git a/tools/create_mads/dists/msvc9/create_mads.vcproj b/devtools/create_mads/dists/msvc9/create_mads.vcproj similarity index 100% rename from tools/create_mads/dists/msvc9/create_mads.vcproj rename to devtools/create_mads/dists/msvc9/create_mads.vcproj diff --git a/tools/create_mads/main.cpp b/devtools/create_mads/main.cpp similarity index 100% rename from tools/create_mads/main.cpp rename to devtools/create_mads/main.cpp diff --git a/tools/create_mads/module.mk b/devtools/create_mads/module.mk similarity index 84% rename from tools/create_mads/module.mk rename to devtools/create_mads/module.mk index db35973eef8..c773da83664 100644 --- a/tools/create_mads/module.mk +++ b/devtools/create_mads/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_mads +MODULE := devtools/create_mads MODULE_OBJS := \ main.o \ diff --git a/tools/create_mads/parser.cpp b/devtools/create_mads/parser.cpp similarity index 100% rename from tools/create_mads/parser.cpp rename to devtools/create_mads/parser.cpp diff --git a/tools/create_mads/parser.h b/devtools/create_mads/parser.h similarity index 100% rename from tools/create_mads/parser.h rename to devtools/create_mads/parser.h diff --git a/tools/create_mads/scripts/rex_nebular.txt b/devtools/create_mads/scripts/rex_nebular.txt similarity index 100% rename from tools/create_mads/scripts/rex_nebular.txt rename to devtools/create_mads/scripts/rex_nebular.txt diff --git a/tools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp similarity index 100% rename from tools/create_project/codeblocks.cpp rename to devtools/create_project/codeblocks.cpp diff --git a/tools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h similarity index 100% rename from tools/create_project/codeblocks.h rename to devtools/create_project/codeblocks.h diff --git a/tools/create_project/codeblocks/create_project.cbp b/devtools/create_project/codeblocks/create_project.cbp similarity index 100% rename from tools/create_project/codeblocks/create_project.cbp rename to devtools/create_project/codeblocks/create_project.cbp diff --git a/tools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp similarity index 100% rename from tools/create_project/create_project.cpp rename to devtools/create_project/create_project.cpp diff --git a/tools/create_project/create_project.h b/devtools/create_project/create_project.h similarity index 100% rename from tools/create_project/create_project.h rename to devtools/create_project/create_project.h diff --git a/tools/create_project/module.mk b/devtools/create_project/module.mk similarity index 91% rename from tools/create_project/module.mk rename to devtools/create_project/module.mk index 9334a126af7..4382fe176ca 100644 --- a/tools/create_project/module.mk +++ b/devtools/create_project/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_project +MODULE := devtools/create_project MODULE_OBJS := \ create_project.o \ diff --git a/tools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp similarity index 100% rename from tools/create_project/msbuild.cpp rename to devtools/create_project/msbuild.cpp diff --git a/tools/create_project/msbuild.h b/devtools/create_project/msbuild.h similarity index 100% rename from tools/create_project/msbuild.h rename to devtools/create_project/msbuild.h diff --git a/tools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp similarity index 96% rename from tools/create_project/msvc.cpp rename to devtools/create_project/msvc.cpp index 9745cffdd29..e2fff59c461 100644 --- a/tools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -152,7 +152,7 @@ std::string MSVCProvider::getPreBuildEvent() const { cmdLine = "@echo off\n" "echo Executing Pre-Build script...\n" "echo.\n" - "@call "$(SolutionDir)../../tools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.."\n" + "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.."\n" "EXIT /B0"; return cmdLine; @@ -164,7 +164,7 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32) const { cmdLine = "@echo off\n" "echo Executing Post-Build script...\n" "echo.\n" - "@call "$(SolutionDir)../../tools/create_project/scripts/postbuild.cmd" "$(SolutionDir)/../.." "$(OutDir)" "; + "@call "$(SolutionDir)../../devtools/create_project/scripts/postbuild.cmd" "$(SolutionDir)/../.." "$(OutDir)" "; cmdLine += (isWin32) ? "x86" : "x64"; diff --git a/tools/create_project/msvc.h b/devtools/create_project/msvc.h similarity index 100% rename from tools/create_project/msvc.h rename to devtools/create_project/msvc.h diff --git a/tools/create_project/msvc10/create_project.sln b/devtools/create_project/msvc10/create_project.sln similarity index 100% rename from tools/create_project/msvc10/create_project.sln rename to devtools/create_project/msvc10/create_project.sln diff --git a/tools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj similarity index 100% rename from tools/create_project/msvc10/create_project.vcxproj rename to devtools/create_project/msvc10/create_project.vcxproj diff --git a/tools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters similarity index 100% rename from tools/create_project/msvc10/create_project.vcxproj.filters rename to devtools/create_project/msvc10/create_project.vcxproj.filters diff --git a/tools/create_project/msvc8/create_project.sln b/devtools/create_project/msvc8/create_project.sln similarity index 100% rename from tools/create_project/msvc8/create_project.sln rename to devtools/create_project/msvc8/create_project.sln diff --git a/tools/create_project/msvc8/create_project.vcproj b/devtools/create_project/msvc8/create_project.vcproj similarity index 100% rename from tools/create_project/msvc8/create_project.vcproj rename to devtools/create_project/msvc8/create_project.vcproj diff --git a/tools/create_project/msvc9/create_project.sln b/devtools/create_project/msvc9/create_project.sln similarity index 100% rename from tools/create_project/msvc9/create_project.sln rename to devtools/create_project/msvc9/create_project.sln diff --git a/tools/create_project/msvc9/create_project.vcproj b/devtools/create_project/msvc9/create_project.vcproj similarity index 100% rename from tools/create_project/msvc9/create_project.vcproj rename to devtools/create_project/msvc9/create_project.vcproj diff --git a/tools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd similarity index 100% rename from tools/create_project/scripts/postbuild.cmd rename to devtools/create_project/scripts/postbuild.cmd diff --git a/tools/create_project/scripts/prebuild.cmd b/devtools/create_project/scripts/prebuild.cmd similarity index 83% rename from tools/create_project/scripts/prebuild.cmd rename to devtools/create_project/scripts/prebuild.cmd index 584e217c653..b824f0d5a06 100644 --- a/tools/create_project/scripts/prebuild.cmd +++ b/devtools/create_project/scripts/prebuild.cmd @@ -12,7 +12,7 @@ REM Root folder if "%~1"=="" goto error_input REM Run the revision script -@call cscript "%~1/tools/create_project/scripts/revision.vbs" %~1 1>NUL +@call cscript "%~1/devtools/create_project/scripts/revision.vbs" %~1 1>NUL if not %errorlevel% == 0 goto error_script goto done diff --git a/tools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs similarity index 100% rename from tools/create_project/scripts/revision.vbs rename to devtools/create_project/scripts/revision.vbs diff --git a/tools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp similarity index 100% rename from tools/create_project/visualstudio.cpp rename to devtools/create_project/visualstudio.cpp diff --git a/tools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h similarity index 100% rename from tools/create_project/visualstudio.h rename to devtools/create_project/visualstudio.h diff --git a/tools/create_teenagent/create_teenagent.cpp b/devtools/create_teenagent/create_teenagent.cpp similarity index 100% rename from tools/create_teenagent/create_teenagent.cpp rename to devtools/create_teenagent/create_teenagent.cpp diff --git a/tools/create_teenagent/md5.cpp b/devtools/create_teenagent/md5.cpp similarity index 100% rename from tools/create_teenagent/md5.cpp rename to devtools/create_teenagent/md5.cpp diff --git a/tools/create_teenagent/md5.h b/devtools/create_teenagent/md5.h similarity index 100% rename from tools/create_teenagent/md5.h rename to devtools/create_teenagent/md5.h diff --git a/tools/create_teenagent/module.mk b/devtools/create_teenagent/module.mk similarity index 83% rename from tools/create_teenagent/module.mk rename to devtools/create_teenagent/module.mk index f7e4e112503..5c9b8761406 100644 --- a/tools/create_teenagent/module.mk +++ b/devtools/create_teenagent/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/create_teenagent +MODULE := devtools/create_teenagent MODULE_OBJS := \ create_teenagent.o \ diff --git a/tools/create_teenagent/util.h b/devtools/create_teenagent/util.h similarity index 100% rename from tools/create_teenagent/util.h rename to devtools/create_teenagent/util.h diff --git a/tools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp similarity index 100% rename from tools/create_toon/create_toon.cpp rename to devtools/create_toon/create_toon.cpp diff --git a/tools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h similarity index 100% rename from tools/create_toon/create_toon.h rename to devtools/create_toon/create_toon.h diff --git a/tools/create_toon/dists/msvc9/create_toon.sln b/devtools/create_toon/dists/msvc9/create_toon.sln similarity index 100% rename from tools/create_toon/dists/msvc9/create_toon.sln rename to devtools/create_toon/dists/msvc9/create_toon.sln diff --git a/tools/create_toon/dists/msvc9/create_toon.vcproj b/devtools/create_toon/dists/msvc9/create_toon.vcproj similarity index 100% rename from tools/create_toon/dists/msvc9/create_toon.vcproj rename to devtools/create_toon/dists/msvc9/create_toon.vcproj diff --git a/tools/create_toon/module.mk b/devtools/create_toon/module.mk similarity index 82% rename from tools/create_toon/module.mk rename to devtools/create_toon/module.mk index 761afb7a7f0..9bcbfcb6e84 100644 --- a/tools/create_toon/module.mk +++ b/devtools/create_toon/module.mk @@ -1,4 +1,4 @@ -MODULE := tools/create_toon +MODULE := devtools/create_toon MODULE_OBJS := \ create_toon.o diff --git a/tools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h similarity index 100% rename from tools/create_toon/staticdata.h rename to devtools/create_toon/staticdata.h diff --git a/tools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp similarity index 100% rename from tools/create_translations/create_translations.cpp rename to devtools/create_translations/create_translations.cpp diff --git a/tools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h similarity index 100% rename from tools/create_translations/create_translations.h rename to devtools/create_translations/create_translations.h diff --git a/tools/create_translations/module.mk b/devtools/create_translations/module.mk similarity index 82% rename from tools/create_translations/module.mk rename to devtools/create_translations/module.mk index 4ffb39183b7..430cf919763 100644 --- a/tools/create_translations/module.mk +++ b/devtools/create_translations/module.mk @@ -1,4 +1,4 @@ -MODULE := tools/create_translations +MODULE := devtools/create_translations MODULE_OBJS := \ po_parser.o \ diff --git a/tools/create_translations/po_parser.cpp b/devtools/create_translations/po_parser.cpp similarity index 100% rename from tools/create_translations/po_parser.cpp rename to devtools/create_translations/po_parser.cpp diff --git a/tools/create_translations/po_parser.h b/devtools/create_translations/po_parser.h similarity index 100% rename from tools/create_translations/po_parser.h rename to devtools/create_translations/po_parser.h diff --git a/tools/credits.pl b/devtools/credits.pl similarity index 100% rename from tools/credits.pl rename to devtools/credits.pl diff --git a/tools/dist-scummvm.sh b/devtools/dist-scummvm.sh similarity index 100% rename from tools/dist-scummvm.sh rename to devtools/dist-scummvm.sh diff --git a/tools/extract-words-tok.pl b/devtools/extract-words-tok.pl similarity index 95% rename from tools/extract-words-tok.pl rename to devtools/extract-words-tok.pl index ea654759aa1..9209d49eb5f 100755 --- a/tools/extract-words-tok.pl +++ b/devtools/extract-words-tok.pl @@ -32,8 +32,8 @@ # # for i in agigames/*/words.tok # do -# tools/extract-words-tok.pl "$i" -# done | tools/construct-pred-dict.pl +# devtools/extract-words-tok.pl "$i" +# done | devtools/construct-pred-dict.pl # local $/; diff --git a/tools/make-scumm-fontdata.c b/devtools/make-scumm-fontdata.c similarity index 100% rename from tools/make-scumm-fontdata.c rename to devtools/make-scumm-fontdata.c diff --git a/tools/md5table.c b/devtools/md5table.c similarity index 100% rename from tools/md5table.c rename to devtools/md5table.c diff --git a/devtools/module.mk b/devtools/module.mk new file mode 100644 index 00000000000..fdbc13f645b --- /dev/null +++ b/devtools/module.mk @@ -0,0 +1,86 @@ +# $URL$ +# $Id$ + +MODULE := devtools + +MODULE_DIRS += \ + devtools/ + + +####################################################################### +# Tools directory +####################################################################### + +DEVTOOLS := \ + devtools/convbdf$(EXEEXT) \ + devtools/md5table$(EXEEXT) \ + devtools/make-scumm-fontdata$(EXEEXT) + +include $(srcdir)/devtools/*/module.mk + +.PHONY: $(srcdir)/devtools/*/module.mk + +# Make sure the 'all' / 'clean' targets build/clean the devtools, too +#all: +clean: clean-devtools + +# Main target +devtools: $(DEVTOOLS) + +clean-devtools: + -$(RM) $(DEVTOOLS) + +# +# Build rules for the devtools +# + +devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.c + $(QUIET)$(MKDIR) devtools/$(DEPDIR) + $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< + +devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c + $(QUIET)$(MKDIR) devtools/$(DEPDIR) + $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< + +devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c + $(QUIET)$(MKDIR) devtools/$(DEPDIR) + $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< + +# +# Rules to explicitly rebuild the credits / MD5 tables. +# The rules for the files in the "web" resp. "docs" modules +# assume that you are invoking "make" from within a complete +# checkout of the ScummVM repository. Of course if that is not the +# case, then you have to modify those paths... +# + +credits: + $(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS +# $(srcdir)/devtools/credits.pl --rtf > $(srcdir)/Credits.rtf + $(srcdir)/devtools/credits.pl --cpp > $(srcdir)/gui/credits.h + $(srcdir)/devtools/credits.pl --xml-website > $(srcdir)/../../web/trunk/data/credits.xml +# $(srcdir)/devtools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml + +md5scumm: devtools/md5table$(EXEEXT) + devtools/md5table$(EXEEXT) --c++ < $(srcdir)/devtools/scumm-md5.txt > $(srcdir)/engines/scumm/scumm-md5.h + +# +# Rules which automatically and implicitly rebuild the credits and +# MD5 tables when needed. +# These are currently disabled, because if the input data changes, then +# the generated files should be checked in, too. Otherwise, we'd reduce +# portability to system on which our devtools can't (automatically) be +# run for some reason. +# + +#scumm/scumm-md5.h: $(srcdir)/devtools/scumm-md5.txt devtools/md5table$(EXEEXT) +# devtools/md5table$(EXEEXT) --c++ < $< > $@ + +#AUTHORS: $(srcdir)/devtools/credits.pl +# $(srcdir)/devtools/credits.pl --text > $@ + +#gui/credits.h: $(srcdir)/devtools/credits.pl +# $(srcdir)/devtools/credits.pl --cpp > $@ + + +.PHONY: clean-devtools devtools credits md5scumm diff --git a/tools/qtable/fat_amiga_demo.h b/devtools/qtable/fat_amiga_demo.h similarity index 100% rename from tools/qtable/fat_amiga_demo.h rename to devtools/qtable/fat_amiga_demo.h diff --git a/tools/qtable/fat_amiga_eng_floppy.h b/devtools/qtable/fat_amiga_eng_floppy.h similarity index 100% rename from tools/qtable/fat_amiga_eng_floppy.h rename to devtools/qtable/fat_amiga_eng_floppy.h diff --git a/tools/qtable/fat_amiga_interview.h b/devtools/qtable/fat_amiga_interview.h similarity index 100% rename from tools/qtable/fat_amiga_interview.h rename to devtools/qtable/fat_amiga_interview.h diff --git a/tools/qtable/fat_eng_cdrom.h b/devtools/qtable/fat_eng_cdrom.h similarity index 100% rename from tools/qtable/fat_eng_cdrom.h rename to devtools/qtable/fat_eng_cdrom.h diff --git a/tools/qtable/fat_eng_floppy.h b/devtools/qtable/fat_eng_floppy.h similarity index 100% rename from tools/qtable/fat_eng_floppy.h rename to devtools/qtable/fat_eng_floppy.h diff --git a/tools/qtable/fat_fre_cdrom.h b/devtools/qtable/fat_fre_cdrom.h similarity index 100% rename from tools/qtable/fat_fre_cdrom.h rename to devtools/qtable/fat_fre_cdrom.h diff --git a/tools/qtable/fat_fre_floppy.h b/devtools/qtable/fat_fre_floppy.h similarity index 100% rename from tools/qtable/fat_fre_floppy.h rename to devtools/qtable/fat_fre_floppy.h diff --git a/tools/qtable/fat_ger_cdrom.h b/devtools/qtable/fat_ger_cdrom.h similarity index 100% rename from tools/qtable/fat_ger_cdrom.h rename to devtools/qtable/fat_ger_cdrom.h diff --git a/tools/qtable/fat_ger_floppy.h b/devtools/qtable/fat_ger_floppy.h similarity index 100% rename from tools/qtable/fat_ger_floppy.h rename to devtools/qtable/fat_ger_floppy.h diff --git a/tools/qtable/fat_heb_cdrom.h b/devtools/qtable/fat_heb_cdrom.h similarity index 100% rename from tools/qtable/fat_heb_cdrom.h rename to devtools/qtable/fat_heb_cdrom.h diff --git a/tools/qtable/fat_ita_cdrom.h b/devtools/qtable/fat_ita_cdrom.h similarity index 100% rename from tools/qtable/fat_ita_cdrom.h rename to devtools/qtable/fat_ita_cdrom.h diff --git a/tools/qtable/fat_ita_floppy.h b/devtools/qtable/fat_ita_floppy.h similarity index 100% rename from tools/qtable/fat_ita_floppy.h rename to devtools/qtable/fat_ita_floppy.h diff --git a/tools/qtable/fat_pc_demo.h b/devtools/qtable/fat_pc_demo.h similarity index 100% rename from tools/qtable/fat_pc_demo.h rename to devtools/qtable/fat_pc_demo.h diff --git a/tools/qtable/fat_pc_demo_pcgames.h b/devtools/qtable/fat_pc_demo_pcgames.h similarity index 100% rename from tools/qtable/fat_pc_demo_pcgames.h rename to devtools/qtable/fat_pc_demo_pcgames.h diff --git a/tools/qtable/fat_pc_interview.h b/devtools/qtable/fat_pc_interview.h similarity index 100% rename from tools/qtable/fat_pc_interview.h rename to devtools/qtable/fat_pc_interview.h diff --git a/tools/qtable/fat_spa_cdrom.h b/devtools/qtable/fat_spa_cdrom.h similarity index 100% rename from tools/qtable/fat_spa_cdrom.h rename to devtools/qtable/fat_spa_cdrom.h diff --git a/tools/qtable/module.mk b/devtools/qtable/module.mk similarity index 85% rename from tools/qtable/module.mk rename to devtools/qtable/module.mk index 43225040c8e..5aab9ad0c77 100644 --- a/tools/qtable/module.mk +++ b/devtools/qtable/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/qtable +MODULE := devtools/qtable MODULE_OBJS := \ qtable.o diff --git a/tools/qtable/qtable.cpp b/devtools/qtable/qtable.cpp similarity index 100% rename from tools/qtable/qtable.cpp rename to devtools/qtable/qtable.cpp diff --git a/tools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp similarity index 100% rename from tools/sci/musicplayer.cpp rename to devtools/sci/musicplayer.cpp diff --git a/tools/sci/scidisasm.cpp b/devtools/sci/scidisasm.cpp similarity index 100% rename from tools/sci/scidisasm.cpp rename to devtools/sci/scidisasm.cpp diff --git a/tools/sci/scipack.cpp b/devtools/sci/scipack.cpp similarity index 100% rename from tools/sci/scipack.cpp rename to devtools/sci/scipack.cpp diff --git a/tools/sci/scitrace.asm b/devtools/sci/scitrace.asm similarity index 100% rename from tools/sci/scitrace.asm rename to devtools/sci/scitrace.asm diff --git a/tools/scumm-md5.txt b/devtools/scumm-md5.txt similarity index 100% rename from tools/scumm-md5.txt rename to devtools/scumm-md5.txt diff --git a/tools/skycpt/288diff.txt b/devtools/skycpt/288diff.txt similarity index 100% rename from tools/skycpt/288diff.txt rename to devtools/skycpt/288diff.txt diff --git a/tools/skycpt/AsciiCptCompile.cpp b/devtools/skycpt/AsciiCptCompile.cpp similarity index 100% rename from tools/skycpt/AsciiCptCompile.cpp rename to devtools/skycpt/AsciiCptCompile.cpp diff --git a/tools/skycpt/AsciiCptCompile.sln b/devtools/skycpt/AsciiCptCompile.sln similarity index 100% rename from tools/skycpt/AsciiCptCompile.sln rename to devtools/skycpt/AsciiCptCompile.sln diff --git a/tools/skycpt/AsciiCptCompile.vcproj b/devtools/skycpt/AsciiCptCompile.vcproj similarity index 100% rename from tools/skycpt/AsciiCptCompile.vcproj rename to devtools/skycpt/AsciiCptCompile.vcproj diff --git a/tools/skycpt/COMPACT.TXT b/devtools/skycpt/COMPACT.TXT similarity index 100% rename from tools/skycpt/COMPACT.TXT rename to devtools/skycpt/COMPACT.TXT diff --git a/tools/skycpt/KmpSearch.cpp b/devtools/skycpt/KmpSearch.cpp similarity index 100% rename from tools/skycpt/KmpSearch.cpp rename to devtools/skycpt/KmpSearch.cpp diff --git a/tools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h similarity index 100% rename from tools/skycpt/KmpSearch.h rename to devtools/skycpt/KmpSearch.h diff --git a/tools/skycpt/README b/devtools/skycpt/README similarity index 100% rename from tools/skycpt/README rename to devtools/skycpt/README diff --git a/tools/skycpt/TextFile.cpp b/devtools/skycpt/TextFile.cpp similarity index 100% rename from tools/skycpt/TextFile.cpp rename to devtools/skycpt/TextFile.cpp diff --git a/tools/skycpt/TextFile.h b/devtools/skycpt/TextFile.h similarity index 100% rename from tools/skycpt/TextFile.h rename to devtools/skycpt/TextFile.h diff --git a/tools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp similarity index 100% rename from tools/skycpt/cptcompiler.cpp rename to devtools/skycpt/cptcompiler.cpp diff --git a/tools/skycpt/cpthelp.cpp b/devtools/skycpt/cpthelp.cpp similarity index 100% rename from tools/skycpt/cpthelp.cpp rename to devtools/skycpt/cpthelp.cpp diff --git a/tools/skycpt/cpthelp.h b/devtools/skycpt/cpthelp.h similarity index 100% rename from tools/skycpt/cpthelp.h rename to devtools/skycpt/cpthelp.h diff --git a/tools/skycpt/idFinder.cpp b/devtools/skycpt/idFinder.cpp similarity index 100% rename from tools/skycpt/idFinder.cpp rename to devtools/skycpt/idFinder.cpp diff --git a/tools/skycpt/module.mk b/devtools/skycpt/module.mk similarity index 90% rename from tools/skycpt/module.mk rename to devtools/skycpt/module.mk index 8ce208210bf..84a59cee9f5 100644 --- a/tools/skycpt/module.mk +++ b/devtools/skycpt/module.mk @@ -1,7 +1,7 @@ # $URL$ # $Id$ -MODULE := tools/skycpt +MODULE := devtools/skycpt MODULE_OBJS := \ AsciiCptCompile.o \ diff --git a/tools/skycpt/savedata.txt b/devtools/skycpt/savedata.txt similarity index 100% rename from tools/skycpt/savedata.txt rename to devtools/skycpt/savedata.txt diff --git a/tools/skycpt/skycpt-engine.patch b/devtools/skycpt/skycpt-engine.patch similarity index 100% rename from tools/skycpt/skycpt-engine.patch rename to devtools/skycpt/skycpt-engine.patch diff --git a/tools/skycpt/stdafx.cpp b/devtools/skycpt/stdafx.cpp similarity index 100% rename from tools/skycpt/stdafx.cpp rename to devtools/skycpt/stdafx.cpp diff --git a/tools/skycpt/stdafx.h b/devtools/skycpt/stdafx.h similarity index 100% rename from tools/skycpt/stdafx.h rename to devtools/skycpt/stdafx.h diff --git a/tools/svnpropset.sh b/devtools/svnpropset.sh similarity index 100% rename from tools/svnpropset.sh rename to devtools/svnpropset.sh diff --git a/tools/themeparser.py b/devtools/themeparser.py similarity index 100% rename from tools/themeparser.py rename to devtools/themeparser.py diff --git a/tools/update-version.pl b/devtools/update-version.pl similarity index 100% rename from tools/update-version.pl rename to devtools/update-version.pl diff --git a/dists/msvc10/readme.txt b/dists/msvc10/readme.txt index be7b8a4db56..fa077fa485b 100644 --- a/dists/msvc10/readme.txt +++ b/dists/msvc10/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc10.bat file for a default build. You can run diff --git a/dists/msvc8/readme.txt b/dists/msvc8/readme.txt index 461e5c9bd5b..95b55e973a3 100644 --- a/dists/msvc8/readme.txt +++ b/dists/msvc8/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc8.bat file for a default build. You can run diff --git a/dists/msvc9/readme.txt b/dists/msvc9/readme.txt index 059c9e556b9..410b8ea4034 100644 --- a/dists/msvc9/readme.txt +++ b/dists/msvc9/readme.txt @@ -1,5 +1,5 @@ The Visual Studio project files can now be created automatically from the GCC -files using the create_project tool inside the /tools/create_project folder. +files using the create_project tool inside the /devtools/create_project folder. To create the default project files, build create_project.exe, copy it inside this folder and run the create_msvc9.bat file for a default build. You can run diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 8372bf9ad11..9948c520012 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -102,7 +102,7 @@ protected: enum KyraResources { kLoadAll = -1, - // This list has to match orderwise (and thus value wise) the static data list of "tools/create_kyradat/create_kyradat.h"! + // This list has to match orderwise (and thus value wise) the static data list of "devtools/create_kyradat/create_kyradat.h"! k1ForestSeq = 1, k1KallakWritingSeq, k1KyrandiaLogoSeq, diff --git a/po/module.mk b/po/module.mk index 47c5a401c45..d2d6127321f 100644 --- a/po/module.mk +++ b/po/module.mk @@ -33,8 +33,8 @@ updatepot: mv -f $@.new $@; \ fi; -translations-dat: tools/create_translations - tools/create_translations/create_translations $(POFILES) +translations-dat: devtools/create_translations + devtools/create_translations/create_translations $(POFILES) mv translations.dat $(srcdir)/gui/themes/ update-translations: updatepot $(POFILES) translations-dat diff --git a/ports.mk b/ports.mk index c56031ef111..13b4e48c525 100644 --- a/ports.mk +++ b/ports.mk @@ -47,7 +47,7 @@ bundle: scummvm-static ifdef DIST_FILES_ENGINEDATA cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/ endif - $(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf + $(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf chmod 644 $(bundle_name)/Contents/Resources/* cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm chmod 755 $(bundle_name)/Contents/MacOS/scummvm @@ -138,7 +138,7 @@ iphone: $(OBJS) # TODO: Replace AUTHORS by Credits.rtf osxsnap: bundle mkdir ScummVM-snapshot - $(srcdir)/tools/credits.pl --text > $(srcdir)/AUTHORS + $(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS cp $(srcdir)/AUTHORS ./ScummVM-snapshot/Authors cp $(srcdir)/COPYING ./ScummVM-snapshot/License\ \(GPL\) cp $(srcdir)/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\) diff --git a/rules.mk b/rules.mk index fde462fc0b2..c531d49a293 100644 --- a/rules.mk +++ b/rules.mk @@ -28,12 +28,12 @@ $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) # Reset TOOL_EXECUTABLE var TOOL_EXECUTABLE:= -# Add to "tools" target -tools: $(TOOL-$(MODULE)) +# Add to "devtools" target +devtools: $(TOOL-$(MODULE)) -# Pseudo target for comfort, allows for "make tools/skycpt", etc. +# Pseudo target for comfort, allows for "make devtools/skycpt", etc. $(MODULE): $(TOOL-$(MODULE)) -clean-tools: clean-$(MODULE) +clean-devtools: clean-$(MODULE) else ifdef PLUGIN diff --git a/tools/module.mk b/tools/module.mk deleted file mode 100644 index 3368f5e527a..00000000000 --- a/tools/module.mk +++ /dev/null @@ -1,86 +0,0 @@ -# $URL$ -# $Id$ - -MODULE := tools - -MODULE_DIRS += \ - tools/ - - -####################################################################### -# Tools directory -####################################################################### - -TOOLS := \ - tools/convbdf$(EXEEXT) \ - tools/md5table$(EXEEXT) \ - tools/make-scumm-fontdata$(EXEEXT) - -include $(srcdir)/tools/*/module.mk - -.PHONY: $(srcdir)/tools/*/module.mk - -# Make sure the 'all' / 'clean' targets build/clean the tools, too -#all: -clean: clean-tools - -# Main target -tools: $(TOOLS) - -clean-tools: - -$(RM) $(TOOLS) - -# -# Build rules for the tools -# - -tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c - $(QUIET)$(MKDIR) tools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< - -tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c - $(QUIET)$(MKDIR) tools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< - -tools/make-scumm-fontdata$(EXEEXT): $(srcdir)/tools/make-scumm-fontdata.c - $(QUIET)$(MKDIR) tools/$(DEPDIR) - $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $< - -# -# Rules to explicitly rebuild the credits / MD5 tables. -# The rules for the files in the "web" resp. "docs" modules -# assume that you are invoking "make" from within a complete -# checkout of the ScummVM repository. Of course if that is not the -# case, then you have to modify those paths... -# - -credits: - $(srcdir)/tools/credits.pl --text > $(srcdir)/AUTHORS -# $(srcdir)/tools/credits.pl --rtf > $(srcdir)/Credits.rtf - $(srcdir)/tools/credits.pl --cpp > $(srcdir)/gui/credits.h - $(srcdir)/tools/credits.pl --xml-website > $(srcdir)/../../web/trunk/data/credits.xml -# $(srcdir)/tools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml - -md5scumm: tools/md5table$(EXEEXT) - tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/scumm-md5.txt > $(srcdir)/engines/scumm/scumm-md5.h - -# -# Rules which automatically and implicitly rebuild the credits and -# MD5 tables when needed. -# These are currently disabled, because if the input data changes, then -# the generated files should be checked in, too. Otherwise, we'd reduce -# portability to system on which our tools can't (automatically) be -# run for some reason. -# - -#scumm/scumm-md5.h: $(srcdir)/tools/scumm-md5.txt tools/md5table$(EXEEXT) -# tools/md5table$(EXEEXT) --c++ < $< > $@ - -#AUTHORS: $(srcdir)/tools/credits.pl -# $(srcdir)/tools/credits.pl --text > $@ - -#gui/credits.h: $(srcdir)/tools/credits.pl -# $(srcdir)/tools/credits.pl --cpp > $@ - - -.PHONY: clean-tools tools credits md5scumm