ALL: Use initPlatform() in every single tool

xoreos · Oct 19, 2016 · c1018fa · c1018fa
1 parent efe43ed
commit c1018fa
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 0 deletions.
diff --git a/src/cbgt2tga.cpp b/src/cbgt2tga.cpp
@@ -39,6 +39,8 @@
 
 #include "src/images/cbgt.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &cbgtFile , Common::UString &palFile,
@@ -48,6 +50,8 @@ void convert(const Common::UString &cbgtFile , const Common::UString &palFile,
              const Common::UString &twoDAFile, const Common::UString &outFile);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/cdpth2tga.cpp b/src/cdpth2tga.cpp
@@ -40,6 +40,8 @@
 
 #include "src/images/cdpth.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &cdpthFile, Common::UString &twoDAFile,
@@ -49,6 +51,8 @@ void convert(const Common::UString &cdpthFile, const Common::UString &twoDAFile,
              const Common::UString &outFile);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/convert2da.cpp b/src/convert2da.cpp
@@ -41,6 +41,8 @@
 #include "src/aurora/2dafile.h"
 #include "src/aurora/gdafile.h"
 
+#include "src/util.h"
+
 enum Format {
 	kFormat2DA,
 	kFormat2DAb,
@@ -58,6 +60,8 @@ void convert2DA(const Common::UString &file, const Common::UString &outFile, For
 void convert2DA(const std::vector<Common::UString> &files, const Common::UString &outFile, Format format);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/desmall.cpp b/src/desmall.cpp
@@ -37,13 +37,17 @@
 
 #include "src/aurora/smallfile.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile);
 
 void desmall(const Common::UString &inFile, const Common::UString &outFile);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/fixpremiumgff.cpp b/src/fixpremiumgff.cpp
@@ -41,13 +41,17 @@
 
 #include "src/aurora/types.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile, Common::UString &id);
 
 void fixPremiumGFF(Common::UString &inFile, Common::UString &outFile, Common::UString &id);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/gff2xml.cpp b/src/gff2xml.cpp
@@ -42,6 +42,8 @@
 
 #include "src/xml/gffdumper.h"
 
+#include "src/util.h"
+
 typedef std::map<uint32, Common::Encoding> EncodingOverrides;
 
 void printUsage(FILE *stream, const Common::UString &name);
@@ -56,6 +58,8 @@ void dumpGFF(const Common::UString &inFile, const Common::UString &outFile,
              Common::Encoding encoding, bool nwnPremium);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/nbfs2tga.cpp b/src/nbfs2tga.cpp
@@ -40,6 +40,8 @@
 
 #include "src/images/nbfs.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &nbfsFile, Common::UString &nbfpFile,
@@ -49,6 +51,8 @@ void convert(const Common::UString &nbfsFile, const Common::UString &nbfpFile,
              const Common::UString &outFile, uint32 width, uint32 height);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/ncgr2tga.cpp b/src/ncgr2tga.cpp
@@ -41,6 +41,8 @@
 
 #include "src/images/ncgr.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       uint32 &width, uint32 &height, std::vector<Common::UString> &ncgrFiles,
@@ -50,6 +52,8 @@ void convert(std::vector<Common::UString> &ncgrFiles, Common::UString &nclrFile,
              Common::UString &outFile, uint32 width, uint32 height);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/ncsdis.cpp b/src/ncsdis.cpp
@@ -42,6 +42,8 @@
 
 #include "src/nwscript/disassembler.h"
 
+#include "src/util.h"
+
 enum Command {
 	kCommandNone     = -1,
 	kCommandListing  =  0,
@@ -60,6 +62,8 @@ void disNCS(const Common::UString &inFile, const Common::UString &outFile,
             Aurora::GameID &game, Command &command, bool printStack, bool printControlTypes);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/rules.mk b/src/rules.mk
@@ -32,6 +32,7 @@ noinst_HEADERS += \
 bin_PROGRAMS += src/gff2xml
 src_gff2xml_SOURCES = \
     src/gff2xml.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_gff2xml_LDADD = \
     src/xml/libxml.la \
@@ -44,6 +45,7 @@ src_gff2xml_LDADD = \
 bin_PROGRAMS += src/tlk2xml
 src_tlk2xml_SOURCES = \
     src/tlk2xml.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_tlk2xml_LDADD = \
     src/xml/libxml.la \
@@ -56,6 +58,7 @@ src_tlk2xml_LDADD = \
 bin_PROGRAMS += src/ssf2xml
 src_ssf2xml_SOURCES = \
     src/ssf2xml.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_ssf2xml_LDADD = \
     src/xml/libxml.la \
@@ -68,6 +71,7 @@ src_ssf2xml_LDADD = \
 bin_PROGRAMS += src/xml2tlk
 src_xml2tlk_SOURCES = \
     src/xml2tlk.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_xml2tlk_LDADD = \
     src/xml/libxml.la \
@@ -80,6 +84,7 @@ src_xml2tlk_LDADD = \
 bin_PROGRAMS += src/xml2ssf
 src_xml2ssf_SOURCES = \
     src/xml2ssf.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_xml2ssf_LDADD = \
     src/xml/libxml.la \
@@ -92,6 +97,7 @@ src_xml2ssf_LDADD = \
 bin_PROGRAMS += src/convert2da
 src_convert2da_SOURCES = \
     src/convert2da.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_convert2da_LDADD = \
     src/aurora/libaurora.la \
@@ -103,6 +109,7 @@ src_convert2da_LDADD = \
 bin_PROGRAMS += src/fixpremiumgff
 src_fixpremiumgff_SOURCES = \
     src/fixpremiumgff.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_fixpremiumgff_LDADD = \
     src/aurora/libaurora.la \
@@ -189,6 +196,7 @@ src_unnsbtx_LDADD = \
 bin_PROGRAMS += src/desmall
 src_desmall_SOURCES = \
     src/desmall.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_desmall_LDADD = \
     src/aurora/libaurora.la \
@@ -200,6 +208,7 @@ src_desmall_LDADD = \
 bin_PROGRAMS += src/xoreostex2tga
 src_xoreostex2tga_SOURCES = \
     src/xoreostex2tga.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_xoreostex2tga_LDADD = \
     src/images/libimages.la \
@@ -212,6 +221,7 @@ src_xoreostex2tga_LDADD = \
 bin_PROGRAMS += src/nbfs2tga
 src_nbfs2tga_SOURCES = \
     src/nbfs2tga.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_nbfs2tga_LDADD = \
     src/images/libimages.la \
@@ -224,6 +234,7 @@ src_nbfs2tga_LDADD = \
 bin_PROGRAMS += src/ncgr2tga
 src_ncgr2tga_SOURCES = \
     src/ncgr2tga.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_ncgr2tga_LDADD = \
     src/images/libimages.la \
@@ -236,6 +247,7 @@ src_ncgr2tga_LDADD = \
 bin_PROGRAMS += src/cbgt2tga
 src_cbgt2tga_SOURCES = \
     src/cbgt2tga.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_cbgt2tga_LDADD = \
     src/images/libimages.la \
@@ -248,6 +260,7 @@ src_cbgt2tga_LDADD = \
 bin_PROGRAMS += src/cdpth2tga
 src_cdpth2tga_SOURCES = \
     src/cdpth2tga.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_cdpth2tga_LDADD = \
     src/images/libimages.la \
@@ -260,6 +273,7 @@ src_cdpth2tga_LDADD = \
 bin_PROGRAMS += src/ncsdis
 src_ncsdis_SOURCES = \
     src/ncsdis.cpp \
+    src/util.cpp \
     $(EMPTY)
 src_ncsdis_LDADD = \
     src/nwscript/libnwscript.la \

diff --git a/src/ssf2xml.cpp b/src/ssf2xml.cpp
@@ -38,13 +38,17 @@
 
 #include "src/xml/ssfdumper.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile);
 
 void dumpSSF(const Common::UString &inFile, const Common::UString &outFile);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/tlk2xml.cpp b/src/tlk2xml.cpp
@@ -42,6 +42,8 @@
 
 #include "src/xml/tlkdumper.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile,
@@ -50,6 +52,8 @@ bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue
 void dumpTLK(const Common::UString &inFile, const Common::UString &outFile, Common::Encoding encoding);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/unerf.cpp b/src/unerf.cpp
@@ -81,6 +81,8 @@ void extractFiles(Aurora::ERFFile &erf, Aurora::GameID game,
                   std::set<Common::UString> &files, ExtractMode mode);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/unherf.cpp b/src/unherf.cpp
@@ -62,6 +62,8 @@ void listFiles(Aurora::HERFFile &rim);
 void extractFiles(Aurora::HERFFile &rim);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/unkeybif.cpp b/src/unkeybif.cpp
@@ -72,6 +72,8 @@ void extractFiles(const Aurora::BIFFile &bif, Aurora::GameID game);
 void extractFiles(const std::vector<Aurora::BIFFile *> &bifs, const std::vector<Common::UString> &bifFiles, Aurora::GameID game);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	std::vector<Aurora::KEYFile *> keys;
 	std::vector<Aurora::BIFFile *> bifs;
 

diff --git a/src/unnds.cpp b/src/unnds.cpp
@@ -57,6 +57,8 @@ void listFiles(Aurora::NDSFile &nds);
 void extractFiles(Aurora::NDSFile &nds);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/unnsbtx.cpp b/src/unnsbtx.cpp
@@ -57,6 +57,8 @@ void listFiles(Aurora::NSBTXFile &nsbtx);
 void extractFiles(Aurora::NSBTXFile &nsbtx);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/unrim.cpp b/src/unrim.cpp
@@ -55,6 +55,8 @@ void listFiles(Aurora::RIMFile &rim, Aurora::GameID game);
 void extractFiles(Aurora::RIMFile &rim, Aurora::GameID);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/xml2ssf.cpp b/src/xml2ssf.cpp
@@ -41,13 +41,17 @@
 
 #include "src/xml/ssfcreator.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile, Aurora::GameID &game);
 
 void createSSF(const Common::UString &inFile, const Common::UString &outFile, Aurora::GameID game);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);

diff --git a/src/xml2tlk.cpp b/src/xml2tlk.cpp
@@ -42,6 +42,8 @@
 
 #include "src/xml/tlkcreator.h"
 
+#include "src/util.h"
+
 void printUsage(FILE *stream, const Common::UString &name);
 bool parseCommandLine(const std::vector<Common::UString> &argv, int &returnValue,
                       Common::UString &inFile, Common::UString &outFile,
@@ -52,6 +54,8 @@ void createTLK(const Common::UString &inFile, const Common::UString &outFile, Co
                XML::TLKCreator::Version &version, uint32 &language);
 
 int main(int argc, char **argv) {
+	initPlatform();
+
 	try {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);