--- a/.hgignore Sat Nov 24 14:29:47 2012 +0100
+++ b/.hgignore Wed Nov 28 10:57:07 2012 -0500
@@ -30,6 +30,7 @@
glob:misc/liblua/Xcode/build/
glob:misc/libfreetype/Xcode/build/
glob:misc/libfreetype/Xcode-iOS/build/
+glob:misc/physfs/Xcode/build/
glob:moc_*.cxx_parameters
relre:^release\/
glob:*.log
--- a/INSTALL Sat Nov 24 14:29:47 2012 +0100
+++ b/INSTALL Wed Nov 28 10:57:07 2012 -0500
@@ -8,7 +8,7 @@
- SDL_image >= 1.2
- SDL_ttf >= 2.0
- Lua >= 5.1.0
- - Physfs >= 2.0
+ - Physfs >= 2.1
For server:
- Glasgow Haskell Compiler >= 6.10
- bytestring-show package
@@ -20,7 +20,7 @@
For compressed screenshots:
- libpng
-Lua and Physfs will be automatically built if not found.
+Lua will be automatically built if not found.
1. Configure:
--- a/QTfrontend/ui/widget/teamselect.cpp Sat Nov 24 14:29:47 2012 +0100
+++ b/QTfrontend/ui/widget/teamselect.cpp Wed Nov 28 10:57:07 2012 -0500
@@ -59,6 +59,7 @@
this, SLOT(changeTeamStatus(HWTeam)));
}
}
+
emit setEnabledGameStart(curPlayingTeams.size()>1);
}
@@ -168,6 +169,12 @@
m_curNotPlayingTeams.push_back(*itPlay);
emit teamNotPlaying(*itPlay);
curPlayingTeams.erase(itPlay);
+
+ // Show team notice if less than two teams.
+ if (curPlayingTeams.size() < 2)
+ {
+ numTeamNotice->show();
+ }
}
else
{
@@ -179,6 +186,12 @@
curPlayingTeams.push_back(*itDontPlay);
if(!m_acceptOuter) emit teamWillPlay(*itDontPlay);
m_curNotPlayingTeams.erase(itDontPlay);
+
+ // Hide team notice if at least two teams.
+ if (curPlayingTeams.size() >= 2)
+ {
+ numTeamNotice->hide();
+ }
}
FrameTeams* pRemoveTeams;
@@ -254,6 +267,10 @@
framePlaying = new FrameTeams();
frameDontPlaying = new FrameTeams();
+ // Add notice about number of required teams.
+ numTeamNotice = new QLabel("Two teams are required to play!");
+ mainLayout.addWidget((QWidget*)numTeamNotice);
+
QPalette p;
p.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
addScrArea(framePlaying, p.color(QPalette::Window).light(105), 250);
--- a/QTfrontend/ui/widget/teamselect.h Sat Nov 24 14:29:47 2012 +0100
+++ b/QTfrontend/ui/widget/teamselect.h Wed Nov 28 10:57:07 2012 -0500
@@ -20,6 +20,7 @@
#ifndef _TEAM_SELECT_INCLUDED
#define _TEAM_SELECT_INCLUDED
+#include <QLabel>
#include <QGroupBox>
#include <QVBoxLayout>
#include <QColor>
@@ -74,6 +75,7 @@
FrameTeams* framePlaying;
QVBoxLayout mainLayout;
+ QLabel *numTeamNotice;
bool m_acceptOuter;
QList<HWTeam> curPlayingTeams;
--- a/hedgewars/uGears.pas Sat Nov 24 14:29:47 2012 +0100
+++ b/hedgewars/uGears.pas Wed Nov 28 10:57:07 2012 -0500
@@ -906,10 +906,6 @@
inc(Count)
end;
end;
- // unC0Rr, while it is true user can watch value on map screen, IMO this (and check above) should be enforced in UI
- // - is there a good place to put values for the different widgets to check? Right now they are kind of disconnected.
- //it would be nice if divide teams, forts mode and hh per map could all be checked by the team widget, or maybe disable start button
- TryDo(Count <= MaxHedgehogs, 'Too many hedgehogs for this map! (max # is ' + inttostr(MaxHedgehogs) + ')', true);
while (Count > 0) do
begin
i:= GetRandom(Count);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/physfs/Xcode/Physfs.xcodeproj/project.pbxproj Wed Nov 28 10:57:07 2012 -0500
@@ -0,0 +1,354 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 45;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 610FB79016613776002FB2A7 /* archiver_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77916613776002FB2A7 /* archiver_dir.c */; };
+ 610FB79116613776002FB2A7 /* archiver_grp.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77A16613776002FB2A7 /* archiver_grp.c */; };
+ 610FB79216613776002FB2A7 /* archiver_hog.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77B16613776002FB2A7 /* archiver_hog.c */; };
+ 610FB79316613776002FB2A7 /* archiver_iso9660.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77C16613776002FB2A7 /* archiver_iso9660.c */; };
+ 610FB79416613776002FB2A7 /* archiver_lzma.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77D16613776002FB2A7 /* archiver_lzma.c */; };
+ 610FB79516613776002FB2A7 /* archiver_mvl.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77E16613776002FB2A7 /* archiver_mvl.c */; };
+ 610FB79616613776002FB2A7 /* archiver_qpak.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB77F16613776002FB2A7 /* archiver_qpak.c */; };
+ 610FB79716613776002FB2A7 /* archiver_unpacked.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78016613776002FB2A7 /* archiver_unpacked.c */; };
+ 610FB79816613776002FB2A7 /* archiver_wad.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78116613776002FB2A7 /* archiver_wad.c */; };
+ 610FB79916613776002FB2A7 /* archiver_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78216613776002FB2A7 /* archiver_zip.c */; };
+ 610FB79A16613776002FB2A7 /* physfs_byteorder.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78316613776002FB2A7 /* physfs_byteorder.c */; };
+ 610FB79B16613776002FB2A7 /* physfs_casefolding.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB78416613776002FB2A7 /* physfs_casefolding.h */; };
+ 610FB79C16613776002FB2A7 /* physfs_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB78516613776002FB2A7 /* physfs_internal.h */; };
+ 610FB79D16613776002FB2A7 /* physfs_miniz.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB78616613776002FB2A7 /* physfs_miniz.h */; };
+ 610FB79E16613776002FB2A7 /* physfs_platforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB78716613776002FB2A7 /* physfs_platforms.h */; };
+ 610FB79F16613776002FB2A7 /* physfs_unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78816613776002FB2A7 /* physfs_unicode.c */; };
+ 610FB7A016613776002FB2A7 /* physfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78916613776002FB2A7 /* physfs.c */; };
+ 610FB7A116613776002FB2A7 /* physfs.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB78A16613776002FB2A7 /* physfs.h */; };
+ 610FB7A216613776002FB2A7 /* platform_beos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78B16613776002FB2A7 /* platform_beos.cpp */; };
+ 610FB7A316613776002FB2A7 /* platform_macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78C16613776002FB2A7 /* platform_macosx.c */; };
+ 610FB7A416613776002FB2A7 /* platform_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78D16613776002FB2A7 /* platform_posix.c */; };
+ 610FB7A516613776002FB2A7 /* platform_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78E16613776002FB2A7 /* platform_unix.c */; };
+ 610FB7A616613776002FB2A7 /* platform_windows.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB78F16613776002FB2A7 /* platform_windows.c */; };
+ 610FB7AE16613813002FB2A7 /* hwpacksmounter.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB7A916613813002FB2A7 /* hwpacksmounter.c */; };
+ 610FB7AF16613813002FB2A7 /* hwpacksmounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB7AA16613813002FB2A7 /* hwpacksmounter.h */; };
+ 610FB7B016613813002FB2A7 /* physfslualoader.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB7AB16613813002FB2A7 /* physfslualoader.c */; };
+ 610FB7B116613813002FB2A7 /* physfsrwops.c in Sources */ = {isa = PBXBuildFile; fileRef = 610FB7AC16613813002FB2A7 /* physfsrwops.c */; };
+ 610FB7B216613813002FB2A7 /* physfsrwops.h in Headers */ = {isa = PBXBuildFile; fileRef = 610FB7AD16613813002FB2A7 /* physfsrwops.h */; };
+ AA747D9F0F9514B9006C5449 /* Physfs_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* Physfs_Prefix.pch */; };
+ AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 610FB77916613776002FB2A7 /* archiver_dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_dir.c; path = ../src/archiver_dir.c; sourceTree = SOURCE_ROOT; };
+ 610FB77A16613776002FB2A7 /* archiver_grp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_grp.c; path = ../src/archiver_grp.c; sourceTree = SOURCE_ROOT; };
+ 610FB77B16613776002FB2A7 /* archiver_hog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_hog.c; path = ../src/archiver_hog.c; sourceTree = SOURCE_ROOT; };
+ 610FB77C16613776002FB2A7 /* archiver_iso9660.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_iso9660.c; path = ../src/archiver_iso9660.c; sourceTree = SOURCE_ROOT; };
+ 610FB77D16613776002FB2A7 /* archiver_lzma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_lzma.c; path = ../src/archiver_lzma.c; sourceTree = SOURCE_ROOT; };
+ 610FB77E16613776002FB2A7 /* archiver_mvl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_mvl.c; path = ../src/archiver_mvl.c; sourceTree = SOURCE_ROOT; };
+ 610FB77F16613776002FB2A7 /* archiver_qpak.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_qpak.c; path = ../src/archiver_qpak.c; sourceTree = SOURCE_ROOT; };
+ 610FB78016613776002FB2A7 /* archiver_unpacked.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_unpacked.c; path = ../src/archiver_unpacked.c; sourceTree = SOURCE_ROOT; };
+ 610FB78116613776002FB2A7 /* archiver_wad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_wad.c; path = ../src/archiver_wad.c; sourceTree = SOURCE_ROOT; };
+ 610FB78216613776002FB2A7 /* archiver_zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = archiver_zip.c; path = ../src/archiver_zip.c; sourceTree = SOURCE_ROOT; };
+ 610FB78316613776002FB2A7 /* physfs_byteorder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = physfs_byteorder.c; path = ../src/physfs_byteorder.c; sourceTree = SOURCE_ROOT; };
+ 610FB78416613776002FB2A7 /* physfs_casefolding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_casefolding.h; path = ../src/physfs_casefolding.h; sourceTree = SOURCE_ROOT; };
+ 610FB78516613776002FB2A7 /* physfs_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_internal.h; path = ../src/physfs_internal.h; sourceTree = SOURCE_ROOT; };
+ 610FB78616613776002FB2A7 /* physfs_miniz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_miniz.h; path = ../src/physfs_miniz.h; sourceTree = SOURCE_ROOT; };
+ 610FB78716613776002FB2A7 /* physfs_platforms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs_platforms.h; path = ../src/physfs_platforms.h; sourceTree = SOURCE_ROOT; };
+ 610FB78816613776002FB2A7 /* physfs_unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = physfs_unicode.c; path = ../src/physfs_unicode.c; sourceTree = SOURCE_ROOT; };
+ 610FB78916613776002FB2A7 /* physfs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = physfs.c; path = ../src/physfs.c; sourceTree = SOURCE_ROOT; };
+ 610FB78A16613776002FB2A7 /* physfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfs.h; path = ../src/physfs.h; sourceTree = SOURCE_ROOT; };
+ 610FB78B16613776002FB2A7 /* platform_beos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_beos.cpp; path = ../src/platform_beos.cpp; sourceTree = SOURCE_ROOT; };
+ 610FB78C16613776002FB2A7 /* platform_macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform_macosx.c; path = ../src/platform_macosx.c; sourceTree = SOURCE_ROOT; };
+ 610FB78D16613776002FB2A7 /* platform_posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform_posix.c; path = ../src/platform_posix.c; sourceTree = SOURCE_ROOT; };
+ 610FB78E16613776002FB2A7 /* platform_unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform_unix.c; path = ../src/platform_unix.c; sourceTree = SOURCE_ROOT; };
+ 610FB78F16613776002FB2A7 /* platform_windows.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform_windows.c; path = ../src/platform_windows.c; sourceTree = SOURCE_ROOT; };
+ 610FB7A916613813002FB2A7 /* hwpacksmounter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hwpacksmounter.c; path = ../extras/hwpacksmounter.c; sourceTree = SOURCE_ROOT; };
+ 610FB7AA16613813002FB2A7 /* hwpacksmounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hwpacksmounter.h; path = ../extras/hwpacksmounter.h; sourceTree = SOURCE_ROOT; };
+ 610FB7AB16613813002FB2A7 /* physfslualoader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = physfslualoader.c; path = ../extras/physfslualoader.c; sourceTree = SOURCE_ROOT; };
+ 610FB7AC16613813002FB2A7 /* physfsrwops.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = physfsrwops.c; path = ../extras/physfsrwops.c; sourceTree = SOURCE_ROOT; };
+ 610FB7AD16613813002FB2A7 /* physfsrwops.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = physfsrwops.h; path = ../extras/physfsrwops.h; sourceTree = SOURCE_ROOT; };
+ AA747D9E0F9514B9006C5449 /* Physfs_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Physfs_Prefix.pch; sourceTree = SOURCE_ROOT; };
+ AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ D2AAC07E0554694100DB518D /* libPhysfs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPhysfs.a; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ D2AAC07C0554694100DB518D /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 034768DFFF38A50411DB9C8B /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ D2AAC07E0554694100DB518D /* libPhysfs.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 0867D691FE84028FC02AAC07 /* Physfs */ = {
+ isa = PBXGroup;
+ children = (
+ 08FB77AEFE84172EC02AAC07 /* Sources */,
+ 610FB77116613730002FB2A7 /* Extras */,
+ 32C88DFF0371C24200C91783 /* Other Sources */,
+ 0867D69AFE84028FC02AAC07 /* Frameworks */,
+ 034768DFFF38A50411DB9C8B /* Products */,
+ );
+ name = Physfs;
+ sourceTree = "<group>";
+ };
+ 0867D69AFE84028FC02AAC07 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ AACBBE490F95108600F1A2B1 /* Foundation.framework */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+ 08FB77AEFE84172EC02AAC07 /* Sources */ = {
+ isa = PBXGroup;
+ children = (
+ 610FB77916613776002FB2A7 /* archiver_dir.c */,
+ 610FB77A16613776002FB2A7 /* archiver_grp.c */,
+ 610FB77B16613776002FB2A7 /* archiver_hog.c */,
+ 610FB77C16613776002FB2A7 /* archiver_iso9660.c */,
+ 610FB77D16613776002FB2A7 /* archiver_lzma.c */,
+ 610FB77E16613776002FB2A7 /* archiver_mvl.c */,
+ 610FB77F16613776002FB2A7 /* archiver_qpak.c */,
+ 610FB78016613776002FB2A7 /* archiver_unpacked.c */,
+ 610FB78116613776002FB2A7 /* archiver_wad.c */,
+ 610FB78216613776002FB2A7 /* archiver_zip.c */,
+ 610FB78316613776002FB2A7 /* physfs_byteorder.c */,
+ 610FB78416613776002FB2A7 /* physfs_casefolding.h */,
+ 610FB78516613776002FB2A7 /* physfs_internal.h */,
+ 610FB78616613776002FB2A7 /* physfs_miniz.h */,
+ 610FB78716613776002FB2A7 /* physfs_platforms.h */,
+ 610FB78816613776002FB2A7 /* physfs_unicode.c */,
+ 610FB78916613776002FB2A7 /* physfs.c */,
+ 610FB78A16613776002FB2A7 /* physfs.h */,
+ 610FB78B16613776002FB2A7 /* platform_beos.cpp */,
+ 610FB78C16613776002FB2A7 /* platform_macosx.c */,
+ 610FB78D16613776002FB2A7 /* platform_posix.c */,
+ 610FB78E16613776002FB2A7 /* platform_unix.c */,
+ 610FB78F16613776002FB2A7 /* platform_windows.c */,
+ );
+ name = Sources;
+ sourceTree = "<group>";
+ };
+ 32C88DFF0371C24200C91783 /* Other Sources */ = {
+ isa = PBXGroup;
+ children = (
+ AA747D9E0F9514B9006C5449 /* Physfs_Prefix.pch */,
+ );
+ name = "Other Sources";
+ sourceTree = "<group>";
+ };
+ 610FB77116613730002FB2A7 /* Extras */ = {
+ isa = PBXGroup;
+ children = (
+ 610FB7A916613813002FB2A7 /* hwpacksmounter.c */,
+ 610FB7AA16613813002FB2A7 /* hwpacksmounter.h */,
+ 610FB7AB16613813002FB2A7 /* physfslualoader.c */,
+ 610FB7AC16613813002FB2A7 /* physfsrwops.c */,
+ 610FB7AD16613813002FB2A7 /* physfsrwops.h */,
+ );
+ name = Extras;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+ D2AAC07A0554694100DB518D /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AA747D9F0F9514B9006C5449 /* Physfs_Prefix.pch in Headers */,
+ 610FB79B16613776002FB2A7 /* physfs_casefolding.h in Headers */,
+ 610FB79C16613776002FB2A7 /* physfs_internal.h in Headers */,
+ 610FB79D16613776002FB2A7 /* physfs_miniz.h in Headers */,
+ 610FB79E16613776002FB2A7 /* physfs_platforms.h in Headers */,
+ 610FB7A116613776002FB2A7 /* physfs.h in Headers */,
+ 610FB7AF16613813002FB2A7 /* hwpacksmounter.h in Headers */,
+ 610FB7B216613813002FB2A7 /* physfsrwops.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+ D2AAC07D0554694100DB518D /* Physfs */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "Physfs" */;
+ buildPhases = (
+ D2AAC07A0554694100DB518D /* Headers */,
+ D2AAC07B0554694100DB518D /* Sources */,
+ D2AAC07C0554694100DB518D /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = Physfs;
+ productName = Physfs;
+ productReference = D2AAC07E0554694100DB518D /* libPhysfs.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 0867D690FE84028FC02AAC07 /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Physfs" */;
+ compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
+ hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
+ mainGroup = 0867D691FE84028FC02AAC07 /* Physfs */;
+ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ D2AAC07D0554694100DB518D /* Physfs */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+ D2AAC07B0554694100DB518D /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 610FB79016613776002FB2A7 /* archiver_dir.c in Sources */,
+ 610FB79116613776002FB2A7 /* archiver_grp.c in Sources */,
+ 610FB79216613776002FB2A7 /* archiver_hog.c in Sources */,
+ 610FB79316613776002FB2A7 /* archiver_iso9660.c in Sources */,
+ 610FB79416613776002FB2A7 /* archiver_lzma.c in Sources */,
+ 610FB79516613776002FB2A7 /* archiver_mvl.c in Sources */,
+ 610FB79616613776002FB2A7 /* archiver_qpak.c in Sources */,
+ 610FB79716613776002FB2A7 /* archiver_unpacked.c in Sources */,
+ 610FB79816613776002FB2A7 /* archiver_wad.c in Sources */,
+ 610FB79916613776002FB2A7 /* archiver_zip.c in Sources */,
+ 610FB79A16613776002FB2A7 /* physfs_byteorder.c in Sources */,
+ 610FB79F16613776002FB2A7 /* physfs_unicode.c in Sources */,
+ 610FB7A016613776002FB2A7 /* physfs.c in Sources */,
+ 610FB7A216613776002FB2A7 /* platform_beos.cpp in Sources */,
+ 610FB7A316613776002FB2A7 /* platform_macosx.c in Sources */,
+ 610FB7A416613776002FB2A7 /* platform_posix.c in Sources */,
+ 610FB7A516613776002FB2A7 /* platform_unix.c in Sources */,
+ 610FB7A616613776002FB2A7 /* platform_windows.c in Sources */,
+ 610FB7AE16613813002FB2A7 /* hwpacksmounter.c in Sources */,
+ 610FB7B016613813002FB2A7 /* physfslualoader.c in Sources */,
+ 610FB7B116613813002FB2A7 /* physfsrwops.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ 1DEB921F08733DC00010E9CD /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ COPY_PHASE_STRIP = NO;
+ DSTROOT = /tmp/Physfs.dst;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = Physfs_Prefix.pch;
+ INSTALL_PATH = /usr/local/lib;
+ PRODUCT_NAME = Physfs;
+ };
+ name = Debug;
+ };
+ 1DEB922008733DC00010E9CD /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ DSTROOT = /tmp/Physfs.dst;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = Physfs_Prefix.pch;
+ INSTALL_PATH = /usr/local/lib;
+ PRODUCT_NAME = Physfs;
+ };
+ name = Release;
+ };
+ 1DEB922308733DC00010E9CD /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "\"$(SRCROOT)/../../liblua\"",
+ "\"$(SRCROOT)/../../../../Library/SDL/include\"",
+ );
+ OTHER_LDFLAGS = "-ObjC";
+ PREBINDING = NO;
+ SDKROOT = iphoneos;
+ };
+ name = Debug;
+ };
+ 1DEB922408733DC00010E9CD /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "\"$(SRCROOT)/../../liblua\"",
+ "\"$(SRCROOT)/../../../../Library/SDL/include\"",
+ );
+ OTHER_LDFLAGS = "-ObjC";
+ PREBINDING = NO;
+ SDKROOT = iphoneos;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "Physfs" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 1DEB921F08733DC00010E9CD /* Debug */,
+ 1DEB922008733DC00010E9CD /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Physfs" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 1DEB922308733DC00010E9CD /* Debug */,
+ 1DEB922408733DC00010E9CD /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/physfs/Xcode/Physfs_Prefix.pch Wed Nov 28 10:57:07 2012 -0500
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'CocoaTouchStaticLibrary' target in the 'CocoaTouchStaticLibrary' project.
+//
+
+#ifdef __OBJC__
+ #import <Foundation/Foundation.h>
+#endif
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sat Nov 24 14:29:47 2012 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Nov 28 10:57:07 2012 -0500
@@ -34,6 +34,8 @@
610C8E3714E018D200CF5C4C /* MNEValueTrackingSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 610C8E3614E018D200CF5C4C /* MNEValueTrackingSlider.m */; };
610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43411E290650040BA66 /* Icon-Small@2x.png */; };
610D5FB31270E26C0033333A /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F7A43611E290650040BA66 /* Icon@2x.png */; };
+ 610FB7C81661390E002FB2A7 /* uPhysFSLayer.pas in Sources */ = {isa = PBXBuildFile; fileRef = 610FB7C71661390E002FB2A7 /* uPhysFSLayer.pas */; };
+ 610FB81A166139DF002FB2A7 /* libPhysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 610FB7F8166139A4002FB2A7 /* libPhysfs.a */; };
61156521147F48B6006729A9 /* About.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61156520147F48B6006729A9 /* About.strings */; };
61156523147F48B7006729A9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61156522147F48B7006729A9 /* Localizable.strings */; };
61156525147F48B8006729A9 /* Scheme.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61156524147F48B8006729A9 /* Scheme.strings */; };
@@ -255,6 +257,76 @@
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
+ 610FB7E116613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 619599BA1364E65900B429B6 /* Freetype.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = D2AAC07D0554694100DB518D /* libFreetype */;
+ remoteInfo = libFreetype;
+ };
+ 610FB7E316613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19BF414D20D83004B1E6D /* SDL_net.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = BE48FF6507AFA9A800BB41DA /* Static Library */;
+ remoteInfo = "Static Library";
+ };
+ 610FB7E516613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 6195993F1364C82B00B429B6 /* Lua.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = D2AAC07D0554694100DB518D /* libLua */;
+ remoteInfo = libLua;
+ };
+ 610FB7E716613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = FD6526620DE8FCCB002AD96B /* libSDL */;
+ remoteInfo = libSDL;
+ };
+ 610FB7E916613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19C1E14D20F51004B1E6D /* SDL_mixer.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = BE1FA90707AF96B2004B6283 /* Static Library */;
+ remoteInfo = "Static Library";
+ };
+ 610FB7EB16613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19BC114D20CDA004B1E6D /* SDL_ttf.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = BE48FD6807AFA17000BB41DA /* Static Library */;
+ remoteInfo = "Static Library";
+ };
+ 610FB7ED16613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 619598181364BCD200B429B6 /* Tremor.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = D2AAC07D0554694100DB518D /* libTremor */;
+ remoteInfo = libTremor;
+ };
+ 610FB7EF16613980002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 61A19B6114D20B6C004B1E6D /* SDL_image.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = BE1FA72F07AF4C45004B6283 /* libSDL_image */;
+ remoteInfo = libSDL_image;
+ };
+ 610FB7F7166139A4002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 610FB7F3166139A4002FB2A7 /* Physfs.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = D2AAC07E0554694100DB518D /* libPhysfs.a */;
+ remoteInfo = Physfs;
+ };
+ 610FB81B166139EC002FB2A7 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 610FB7F3166139A4002FB2A7 /* Physfs.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = D2AAC07D0554694100DB518D /* Physfs */;
+ remoteInfo = Physfs;
+ };
6162456614E6159C00CC97FB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 619599BA1364E65900B429B6 /* Freetype.xcodeproj */;
@@ -346,6 +418,8 @@
610782951440EE5C00645B29 /* gameMods.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = gameMods.plist; path = Resources/gameMods.plist; sourceTree = "<group>"; };
610C8E3514E018D200CF5C4C /* MNEValueTrackingSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MNEValueTrackingSlider.h; path = Classes/MNEValueTrackingSlider.h; sourceTree = "<group>"; };
610C8E3614E018D200CF5C4C /* MNEValueTrackingSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MNEValueTrackingSlider.m; path = Classes/MNEValueTrackingSlider.m; sourceTree = "<group>"; };
+ 610FB7C71661390E002FB2A7 /* uPhysFSLayer.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uPhysFSLayer.pas; path = ../../hedgewars/uPhysFSLayer.pas; sourceTree = SOURCE_ROOT; };
+ 610FB7F3166139A4002FB2A7 /* Physfs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Physfs.xcodeproj; path = ../../misc/physfs/Xcode/Physfs.xcodeproj; sourceTree = SOURCE_ROOT; };
6115651A147F48AE006729A9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = Locale/English.lproj/About.strings; sourceTree = "<group>"; };
6115651B147F48AE006729A9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = Locale/English.lproj/Localizable.strings; sourceTree = "<group>"; };
6115651C147F48AE006729A9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = Locale/English.lproj/Scheme.strings; sourceTree = "<group>"; };
@@ -649,6 +723,7 @@
616245D114E6160200CC97FB /* libFreetype.a in Frameworks */,
619599451364C83D00B429B6 /* libLua.a in Frameworks */,
6195981F1364BCEF00B429B6 /* libTremor.a in Frameworks */,
+ 610FB81A166139DF002FB2A7 /* libPhysfs.a in Frameworks */,
61A19AFC14D20170004B1E6D /* libSDL2.a in Frameworks */,
61A19B7714D20B7A004B1E6D /* libSDL2_image.a in Frameworks */,
61A19C2414D20F5A004B1E6D /* libSDL2_mixer.a in Frameworks */,
@@ -757,6 +832,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 610FB7F3166139A4002FB2A7 /* Physfs.xcodeproj */,
619599BA1364E65900B429B6 /* Freetype.xcodeproj */,
6195993F1364C82B00B429B6 /* Lua.xcodeproj */,
619598181364BCD200B429B6 /* Tremor.xcodeproj */,
@@ -780,6 +856,14 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 610FB7F4166139A4002FB2A7 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 610FB7F8166139A4002FB2A7 /* libPhysfs.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
61156510147F481B006729A9 /* Locale */ = {
isa = PBXGroup;
children = (
@@ -1133,6 +1217,7 @@
9283015C0F10E48900CC5A3C /* Pascal Sources */ = {
isa = PBXGroup;
children = (
+ 610FB7C71661390E002FB2A7 /* uPhysFSLayer.pas */,
619349C5160BAF3E00A08518 /* uAILandMarks.pas */,
619349C6160BAF3E00A08518 /* uGearsHandlers.pas */,
619349C7160BAF3E00A08518 /* uGearsHandlersRope.pas */,
@@ -1213,6 +1298,15 @@
);
dependencies = (
9283015A0F10E41300CC5A3C /* PBXTargetDependency */,
+ 610FB7E216613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7E416613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7E616613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7E816613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7EA16613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7EC16613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7EE16613980002FB2A7 /* PBXTargetDependency */,
+ 610FB7F016613980002FB2A7 /* PBXTargetDependency */,
+ 610FB81C166139EC002FB2A7 /* PBXTargetDependency */,
);
name = Hedgewars;
productName = HedgewarsMobile;
@@ -1273,6 +1367,10 @@
ProjectRef = 6195993F1364C82B00B429B6 /* Lua.xcodeproj */;
},
{
+ ProductGroup = 610FB7F4166139A4002FB2A7 /* Products */;
+ ProjectRef = 610FB7F3166139A4002FB2A7 /* Physfs.xcodeproj */;
+ },
+ {
ProductGroup = 61A19AE414D2010A004B1E6D /* Products */;
ProjectRef = 61A19AE314D2010A004B1E6D /* SDL.xcodeproj */;
},
@@ -1307,6 +1405,13 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
+ 610FB7F8166139A4002FB2A7 /* libPhysfs.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libPhysfs.a;
+ remoteRef = 610FB7F7166139A4002FB2A7 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
6162456714E6159C00CC97FB /* libFreetype.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1647,12 +1752,58 @@
619349C8160BAF3E00A08518 /* uAILandMarks.pas in Sources */,
619349C9160BAF3E00A08518 /* uGearsHandlers.pas in Sources */,
619349CA160BAF3E00A08518 /* uGearsHandlersRope.pas in Sources */,
+ 610FB7C81661390E002FB2A7 /* uPhysFSLayer.pas in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
+ 610FB7E216613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libFreetype;
+ targetProxy = 610FB7E116613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7E416613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "Static Library";
+ targetProxy = 610FB7E316613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7E616613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libLua;
+ targetProxy = 610FB7E516613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7E816613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libSDL;
+ targetProxy = 610FB7E716613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7EA16613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "Static Library";
+ targetProxy = 610FB7E916613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7EC16613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "Static Library";
+ targetProxy = 610FB7EB16613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7EE16613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libTremor;
+ targetProxy = 610FB7ED16613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB7F016613980002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libSDL_image;
+ targetProxy = 610FB7EF16613980002FB2A7 /* PBXContainerItemProxy */;
+ };
+ 610FB81C166139EC002FB2A7 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = Physfs;
+ targetProxy = 610FB81B166139EC002FB2A7 /* PBXContainerItemProxy */;
+ };
9283015A0F10E41300CC5A3C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 928301160F10CAFC00CC5A3C /* fpc */;