From a959216fb080ba6a113fc021b1c257ee850e7502 Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Tue, 8 Apr 2008 19:25:39 +0200 Subject: [PATCH] (On the way to) fixing that nasty text resource bug * Arrays must not be declared extern (would then be defined twice) * Arrays must not be declared const (would have internal linkage) Still doesn't work reliably... --- orc/ResourceCompiler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orc/ResourceCompiler.cpp b/orc/ResourceCompiler.cpp index b0af770..d67c5b6 100644 --- a/orc/ResourceCompiler.cpp +++ b/orc/ResourceCompiler.cpp @@ -64,17 +64,17 @@ void ResourceCompiler::compile() // write code file contents (remove trailing commas) string output = resourceIdentifierInitializer.str(); - outputFile << "extern const std::string c_ResourceIdentifiers[] = {" << endl; + outputFile << "std::string c_ResourceIdentifiers[] = {" << endl; outputFile << output.substr(0, output.length() - 1); outputFile << endl << "};" << endl << endl; output = resourceIndexInitializer.str(); - outputFile << "extern const unsigned int c_ResourceIndex[][2] = {" << endl; + outputFile << "unsigned int c_ResourceIndex[][2] = {" << endl; outputFile << output.substr(0, output.length() - 1); outputFile << endl << "};" << endl << endl; output = resourceStorageInitializer.str(); - outputFile << "extern const unsigned char c_ResourceStorage[] = {" << endl; + outputFile << "unsigned char c_ResourceStorage[] = {" << endl; outputFile << output.substr(0, output.length() - 1); outputFile << endl << "};" << endl << endl; } -- GitLab