From 8fd0a9b2c50e3ca1d2b0da45a8870e885e20993b Mon Sep 17 00:00:00 2001 From: genywind Date: Sun, 18 Jul 2010 21:41:36 +0400 Subject: [PATCH] fix iphone build --- .gitignore | 1 + .../RhoLib/RhoLib.xcodeproj/project.pbxproj | 16 ++++++++++++---- platform/shared/common/RhodesApp.h | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0bd7c18bd0d..4e2ef791080 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ platform/iphone/tcmalloc/build/* platform/iphone/RhoLib/build/* platform/iphone/Tests/build/* platform/iphone/curl/build/* +lib/extensions/barcode/ext/barcode/platform/iphone/build/* platform/iphone/bin/* platform/iphone/Info.plist platform/mac/bin/* diff --git a/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj b/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj index 612c5ca0bcd..79f214b14cc 100644 --- a/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj +++ b/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj @@ -14,6 +14,9 @@ 5C5335550FC2977600F268F0 /* RhoThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335520FC2977600F268F0 /* RhoThread.h */; }; 5C59BF4D115B4BC300E96ADE /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C59BF4B115B4BC300E96ADE /* unzip.cpp */; }; 5C59BF4E115B4BC300E96ADE /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C59BF4C115B4BC300E96ADE /* unzip.h */; }; + 5C663BEA11F3712C005F60AF /* RhodesAppBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C663BE711F3712C005F60AF /* RhodesAppBase.cpp */; }; + 5C663BEB11F3712C005F60AF /* RhodesAppBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C663BE811F3712C005F60AF /* RhodesAppBase.h */; }; + 5C663BEC11F3712C005F60AF /* RhoError.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C663BE911F3712C005F60AF /* RhoError.h */; }; 5C6855E910A02EAA008DA047 /* RhodesApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6855E610A02EAA008DA047 /* RhodesApp.cpp */; }; 5C6855EA10A02EAA008DA047 /* RhodesApp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C6855E710A02EAA008DA047 /* RhodesApp.h */; }; 5C6B448C0F946589003CB43A /* RhoConf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6B448A0F946589003CB43A /* RhoConf.cpp */; }; @@ -54,7 +57,6 @@ 5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; }; 5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */; }; 5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */; }; - 5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE294111009D8D9009A75F6 /* isysteminfo.h */; }; 5CEBCFEF11E6FB8700145F4E /* rhoparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBCFEE11E6FB8700145F4E /* rhoparams.cpp */; }; 5CECDBB3113FE3620084A75B /* System.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CECDBB2113FE3620084A75B /* System.cpp */; }; BD2C950810AE0D4B008D4692 /* PosixThreadImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */; }; @@ -79,6 +81,9 @@ 5C5335520FC2977600F268F0 /* RhoThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoThread.h; path = ../../shared/common/RhoThread.h; sourceTree = SOURCE_ROOT; }; 5C59BF4B115B4BC300E96ADE /* unzip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = unzip.cpp; path = ../../shared/unzip/unzip.cpp; sourceTree = SOURCE_ROOT; }; 5C59BF4C115B4BC300E96ADE /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = ../../shared/unzip/unzip.h; sourceTree = SOURCE_ROOT; }; + 5C663BE711F3712C005F60AF /* RhodesAppBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhodesAppBase.cpp; path = ../../shared/common/RhodesAppBase.cpp; sourceTree = SOURCE_ROOT; }; + 5C663BE811F3712C005F60AF /* RhodesAppBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhodesAppBase.h; path = ../../shared/common/RhodesAppBase.h; sourceTree = SOURCE_ROOT; }; + 5C663BE911F3712C005F60AF /* RhoError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoError.h; path = ../../shared/common/RhoError.h; sourceTree = SOURCE_ROOT; }; 5C6855E610A02EAA008DA047 /* RhodesApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhodesApp.cpp; path = ../../shared/common/RhodesApp.cpp; sourceTree = SOURCE_ROOT; }; 5C6855E710A02EAA008DA047 /* RhodesApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhodesApp.h; path = ../../shared/common/RhodesApp.h; sourceTree = SOURCE_ROOT; }; 5C6B448A0F946589003CB43A /* RhoConf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoConf.cpp; path = ../../shared/common/RhoConf.cpp; sourceTree = SOURCE_ROOT; }; @@ -119,7 +124,6 @@ 5CBD46281087399700107D0D /* URI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URI.h; path = ../../shared/net/URI.h; sourceTree = SOURCE_ROOT; }; 5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppMenu.cpp; path = ../../shared/common/AppMenu.cpp; sourceTree = SOURCE_ROOT; }; 5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppMenu.h; path = ../../shared/common/AppMenu.h; sourceTree = SOURCE_ROOT; }; - 5CE294111009D8D9009A75F6 /* isysteminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isysteminfo.h; path = ../../shared/common/isysteminfo.h; sourceTree = SOURCE_ROOT; }; 5CEBCFEE11E6FB8700145F4E /* rhoparams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rhoparams.cpp; path = ../../shared/common/rhoparams.cpp; sourceTree = SOURCE_ROOT; }; 5CECDBB2113FE3620084A75B /* System.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = System.cpp; path = ../../shared/rubyext/System.cpp; sourceTree = SOURCE_ROOT; }; BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PosixThreadImpl.cpp; path = ../../shared/common/PosixThreadImpl.cpp; sourceTree = SOURCE_ROOT; }; @@ -200,6 +204,9 @@ 5C7162600F8B7DEE0096B6AA /* common */ = { isa = PBXGroup; children = ( + 5C663BE711F3712C005F60AF /* RhodesAppBase.cpp */, + 5C663BE811F3712C005F60AF /* RhodesAppBase.h */, + 5C663BE911F3712C005F60AF /* RhoError.h */, 5CEBCFEE11E6FB8700145F4E /* rhoparams.cpp */, 5CA2DE8E11B01EF000B868D5 /* ThreadQueue.cpp */, 5CA2DE8F11B01EF000B868D5 /* ThreadQueue.h */, @@ -212,7 +219,6 @@ 5C6855E710A02EAA008DA047 /* RhodesApp.h */, 5C7405901064AF1600163569 /* Tokenizer.cpp */, 5C7405911064AF1600163569 /* Tokenizer.h */, - 5CE294111009D8D9009A75F6 /* isysteminfo.h */, 5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */, 5C5335510FC2977600F268F0 /* RhoThread.cpp */, 5C5335520FC2977600F268F0 /* RhoThread.h */, @@ -318,7 +324,6 @@ 5C98174E0FBC4FCE002597A5 /* irhoclassfactory.h in Headers */, 5C5335530FC2977600F268F0 /* IRhoThreadImpl.h in Headers */, 5C5335550FC2977600F268F0 /* RhoThread.h in Headers */, - 5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */, 5C7405931064AF1600163569 /* Tokenizer.h in Headers */, 5CBD462B1087399700107D0D /* URI.h in Headers */, 5C6855EA10A02EAA008DA047 /* RhodesApp.h in Headers */, @@ -335,6 +340,8 @@ 5C2F10BC116146930054AC80 /* RhoRuby.h in Headers */, 5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */, 5CA2DE9111B01EF000B868D5 /* ThreadQueue.h in Headers */, + 5C663BEB11F3712C005F60AF /* RhodesAppBase.h in Headers */, + 5C663BEC11F3712C005F60AF /* RhoError.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -404,6 +411,7 @@ 5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */, 5CA2DE9011B01EF000B868D5 /* ThreadQueue.cpp in Sources */, 5CEBCFEF11E6FB8700145F4E /* rhoparams.cpp in Sources */, + 5C663BEA11F3712C005F60AF /* RhodesAppBase.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/platform/shared/common/RhodesApp.h b/platform/shared/common/RhodesApp.h index 7ea485b7b21..31c7dc2c27b 100644 --- a/platform/shared/common/RhodesApp.h +++ b/platform/shared/common/RhodesApp.h @@ -1,8 +1,9 @@ #pragma once +#include "RhodesAppBase.h" + #ifdef __cplusplus -#include "RhodesAppBase.h" #include "net/INetRequest.h" #include "net/HttpServer.h"