Permalink
Browse files

Add some more .strings files to the mac build.

Also make sure the licence actually makes it into the builds.
  • Loading branch information...
1 parent a05e8c9 commit 7720aa641da1a8236029949cad05e8bf985ed6e6 @dak180 dak180 committed Sep 2, 2012
Showing with 60 additions and 36 deletions.
  1. +4 −35 macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
  2. +56 −1 macosx/Warzone.xcodeproj/project.pbxproj
@@ -8,46 +8,15 @@ data/texpages/bdrops/backdrop4.png
data/texpages/bdrops/backdrop6.png
- CC0 - Copyright (c) 2010-2011 jorzi
data/base/texpages/page-25-sky-urban.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2006 Mark A. Vargas
-lib/framework/tagfile.*
- - Public Domain
-lib/netplay/miniupnpc/*
+ - CC0, original work by cybersphinx
+3rdparty/miniupnpc/*
- BSD, copyright Thomas Bernard (http://miniupnp.free.fr)
+3rdparty/quesoglc/*
+ - LGPL 2.1, copyright Bertrand Coconnier
data/base/texpages/page-6-features-rockies.png
- CC BY SA 3.0 - Copyright (c) 2009 <Mysteryem>
data/base/texpages/page-17-droid-weapons.png
- CC BY SA 3.0 - Copyright (c) 2009 <Mysteryem>
-data/base/texpages/page-40-ground-plants.png
-data/base/texpages/page-41-slightly-cracked-concrete.png
-data/base/texpages/page-42-rock.png
-data/base/texpages/page-43-mud.png
-data/base/texpages/page-53-cracked-concrete.png
-data/base/texpages/page-54-snow-grass.png
-data/base/texpages/page-55-grass.png
- - GPLv2 or later - Copyright (c) 2008 Image*After/Tristan Bethe (imageafter.com)
-data/base/texpages/page-44-mud.png
-data/base/texpages/page-45-yellow-sand.png
-data/base/texpages/page-46-cliff.png
-data/base/texpages/page-47-tiles.png
- Some source textures have been used which are created by CGTextures.com.
- Permission is granted to use these specific textures under the GPLv2 or
- any later version (at your option). As additional requirement, this text
- should be included in a relevant place in any released product. Note that
- textures downloaded from CGTextures.com DO NOT fall under the GPL license
- by default.
-data/base/texpages/page-48-rubble.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2006 Peter Kaminski
-data/base/texpages/page-49-dirt.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2005 Jennifer Boyer
-data/base/texpages/page-50-rocks.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2007 Mitch Featherston
-data/base/texpages/page-51-debris.png
- - CC BY-SA 2.0 - Adapted from a photo Copyright (c) 2006 Bart Everson
-data/base/texpages/page-52-plants-on-rock.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2008 Sherrie Thai
-data/base/texpages/page-56-gravel.png
-data/base/texpages/page-58-snow-gravel.png
- - CC BY 2.0 - Adapted from a photo Copyright (c) 2007 Konstantin Kleine-Niermann
data/base/components/prop/prsrwhl1.pie
data/base/components/prop/prslwhl1.pie
data/base/components/prop/prmrwhl1.pie
@@ -426,6 +426,9 @@
437D3360150A53E000B45AAE /* qslint in Copy Additional Executables */ = {isa = PBXBuildFile; fileRef = 437D32D9150A47A800B45AAE /* qslint */; };
437DABE714C3345B00DB5F94 /* swapinterval.mm in Sources */ = {isa = PBXBuildFile; fileRef = 437DABE614C3345B00DB5F94 /* swapinterval.mm */; };
438BDDF31129DC9A00998660 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 438BDDD71129DC9A00998660 /* InfoPlist.strings */; };
+ 439B604415F3981700B09DB2 /* COPYING.README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 439B603D15F3981700B09DB2 /* COPYING.README.txt */; };
+ 439B604515F3981700B09DB2 /* COPYING.txt in Resources */ = {isa = PBXBuildFile; fileRef = 439B603F15F3981700B09DB2 /* COPYING.txt */; };
+ 439B604915F3999900B09DB2 /* COPYING.NONGPL.txt in Resources */ = {isa = PBXBuildFile; fileRef = 439B604715F3999900B09DB2 /* COPYING.NONGPL.txt */; };
43A6285B13A6C4A400C6B786 /* geometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43A6285913A6C4A400C6B786 /* geometry.cpp */; };
43A8417811028EDD00733CCB /* pointtree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43A8417611028EDD00733CCB /* pointtree.cpp */; };
43B8F285127C8F9D006F5A13 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43B8F282127C8F9D006F5A13 /* crc.cpp */; };
@@ -1670,6 +1673,14 @@
438BDDF01129DC9A00998660 /* uk_UA */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk_UA; path = Resources/wzlocal/uk_UA.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
438BDDF11129DC9A00998660 /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_CN; path = Resources/wzlocal/zh_CN.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
438BDDF21129DC9A00998660 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_TW; path = Resources/wzlocal/zh_TW.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
+ 439B600315F395E500B09DB2 /* ca_ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca_ES; path = ca_ES.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 439B600415F395E500B09DB2 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 439B600515F395E500B09DB2 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 439B600615F395E500B09DB2 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 439B600715F395E500B09DB2 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ 439B603E15F3981700B09DB2 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = English; path = COPYING.README.txt; sourceTree = "<group>"; };
+ 439B604015F3981700B09DB2 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = English; path = COPYING.txt; sourceTree = "<group>"; };
+ 439B604815F3999900B09DB2 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = English; path = English.lproj/COPYING.NONGPL.txt; sourceTree = "<group>"; };
43A29BF51503C9F700E66094 /* piestate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = piestate.h; path = ../lib/ivis_opengl/piestate.h; sourceTree = SOURCE_ROOT; };
43A29BF61503C9F700E66094 /* pietypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pietypes.h; path = ../lib/ivis_opengl/pietypes.h; sourceTree = SOURCE_ROOT; };
43A6285913A6C4A400C6B786 /* geometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geometry.cpp; path = ../lib/framework/geometry.cpp; sourceTree = SOURCE_ROOT; };
@@ -2759,6 +2770,9 @@
43025C2B111FB072006C49B1 /* wzlocal */ = {
isa = PBXGroup;
children = (
+ 439B604715F3999900B09DB2 /* COPYING.NONGPL.txt */,
+ 439B603D15F3981700B09DB2 /* COPYING.README.txt */,
+ 439B603F15F3981700B09DB2 /* COPYING.txt */,
438BDDD71129DC9A00998660 /* InfoPlist.strings */,
);
name = wzlocal;
@@ -3927,6 +3941,11 @@
et_EE,
ga,
ko,
+ ca_ES,
+ el,
+ hu,
+ sk,
+ tr,
);
mainGroup = 02356D640BD3BB2600E9A019;
productRefGroup = 02356D760BD3BB3400E9A019 /* Products */;
@@ -4044,6 +4063,9 @@
0246A05D0BD3C975004D1C70 /* Warzone.icns in Resources */,
438BDDF31129DC9A00998660 /* InfoPlist.strings in Resources */,
435AE7B014B55C3400B01C85 /* WarzoneHelp in Resources */,
+ 439B604415F3981700B09DB2 /* COPYING.README.txt in Resources */,
+ 439B604515F3981700B09DB2 /* COPYING.txt in Resources */,
+ 439B604915F3999900B09DB2 /* COPYING.NONGPL.txt in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5165,9 +5187,42 @@
438BDDF11129DC9A00998660 /* zh_CN */,
438BDDF21129DC9A00998660 /* zh_TW */,
43D6167F12048D2D004B9630 /* ko */,
+ 439B600315F395E500B09DB2 /* ca_ES */,
+ 439B600415F395E500B09DB2 /* el */,
+ 439B600515F395E500B09DB2 /* hu */,
+ 439B600615F395E500B09DB2 /* sk */,
+ 439B600715F395E500B09DB2 /* tr */,
);
name = InfoPlist.strings;
- sourceTree = "<group>";
+ path = Resources/wzlocal;
+ sourceTree = SOURCE_ROOT;
+ };
+ 439B603D15F3981700B09DB2 /* COPYING.README.txt */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 439B603E15F3981700B09DB2 /* English */,
+ );
+ name = COPYING.README.txt;
+ path = Resources/wzlocal/English.lproj;
+ sourceTree = SOURCE_ROOT;
+ };
+ 439B603F15F3981700B09DB2 /* COPYING.txt */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 439B604015F3981700B09DB2 /* English */,
+ );
+ name = COPYING.txt;
+ path = Resources/wzlocal/English.lproj;
+ sourceTree = SOURCE_ROOT;
+ };
+ 439B604715F3999900B09DB2 /* COPYING.NONGPL.txt */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 439B604815F3999900B09DB2 /* English */,
+ );
+ name = COPYING.NONGPL.txt;
+ path = Resources/wzlocal;
+ sourceTree = SOURCE_ROOT;
};
/* End PBXVariantGroup section */

0 comments on commit 7720aa6

Please sign in to comment.