Index: AE/Installer/trunk/projects/xcode/AE_Installer-GUI/AE Installer (GUI).xcodeproj/project.pbxproj =================================================================== --- AE/Installer/trunk/projects/xcode/AE_Installer-GUI/AE Installer (GUI).xcodeproj/project.pbxproj (revision 386) +++ AE/Installer/trunk/projects/xcode/AE_Installer-GUI/AE Installer (GUI).xcodeproj/project.pbxproj (revision 513) @@ -9,4 +9,5 @@ /* Begin PBXBuildFile section */ 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; + 303936B310A260EA00501722 /* installer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16690FD1EA10009C7CA3 /* installer.cpp */; }; 3057E8FB0FFC054B00299C97 /* libwx_base_carbon_net-2.8.0.6.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3057E8F00FFC054B00299C97 /* libwx_base_carbon_net-2.8.0.6.0.dylib */; }; 3057E8FC0FFC054B00299C97 /* libwx_base_carbon_xml-2.8.0.6.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3057E8F10FFC054B00299C97 /* libwx_base_carbon_xml-2.8.0.6.0.dylib */; }; @@ -30,5 +31,4 @@ 3057E95A0FFC505800299C97 /* libboost_system-xgcc40-mt-1_39.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3057E93E0FFC502600299C97 /* libboost_system-xgcc40-mt-1_39.dylib */; }; 3057EA2310017F9D00299C97 /* AE Button.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3057EA2210017F9D00299C97 /* AE Button.icns */; }; - 306C16710FD1EA10009C7CA3 /* about_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16630FD1EA10009C7CA3 /* about_window.cpp */; }; 306C16720FD1EA10009C7CA3 /* app_resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16650FD1EA10009C7CA3 /* app_resources.cpp */; }; 306C16730FD1EA10009C7CA3 /* fileopen.xpm in Resources */ = {isa = PBXBuildFile; fileRef = 306C16670FD1EA10009C7CA3 /* fileopen.xpm */; }; @@ -39,4 +39,5 @@ 308C556E0FEC412F00225AAD /* aeinstallerapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 308C556C0FEC412F00225AAD /* aeinstallerapp.cpp */; }; 30C26B550FE08F1A003C85EA /* oni_special.ico in Resources */ = {isa = PBXBuildFile; fileRef = 30C26B540FE08F1A003C85EA /* oni_special.ico */; }; + 30E66657100540F80040501B /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30E66655100540F70040501B /* about.cpp */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -88,6 +89,5 @@ 3057E9430FFC502600299C97 /* libboost_wserialization-xgcc40-mt-1_39.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_wserialization-xgcc40-mt-1_39.dylib"; path = "../../../../../Third-Party/Development/boost_1_39_0/build-dynamic-universal/libboost_wserialization-xgcc40-mt-1_39.dylib"; sourceTree = SOURCE_ROOT; }; 3057EA2210017F9D00299C97 /* AE Button.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "AE Button.icns"; sourceTree = ""; }; - 306C16630FD1EA10009C7CA3 /* about_window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = about_window.cpp; path = ../../../source/about_window.cpp; sourceTree = SOURCE_ROOT; }; - 306C16640FD1EA10009C7CA3 /* about_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = about_window.h; path = ../../../source/about_window.h; sourceTree = SOURCE_ROOT; }; + 305BF37810E907C20044A9B1 /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = globals.h; path = ../../../source/globals.h; sourceTree = SOURCE_ROOT; }; 306C16650FD1EA10009C7CA3 /* app_resources.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = app_resources.cpp; path = ../../../source/app_resources.cpp; sourceTree = SOURCE_ROOT; }; 306C16660FD1EA10009C7CA3 /* app_resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = app_resources.h; path = ../../../source/app_resources.h; sourceTree = SOURCE_ROOT; }; @@ -96,6 +96,4 @@ 306C16690FD1EA10009C7CA3 /* installer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = installer.cpp; path = ../../../source/installer.cpp; sourceTree = SOURCE_ROOT; }; 306C166A0FD1EA10009C7CA3 /* installer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = installer.h; path = ../../../source/installer.h; sourceTree = SOURCE_ROOT; }; - 306C166B0FD1EA10009C7CA3 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = main.cpp; path = ../../../source/main.cpp; sourceTree = SOURCE_ROOT; }; - 306C166C0FD1EA10009C7CA3 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = main.h; path = ../../../source/main.h; sourceTree = SOURCE_ROOT; }; 306C166D0FD1EA10009C7CA3 /* main_window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = main_window.cpp; path = ../../../source/main_window.cpp; sourceTree = SOURCE_ROOT; }; 306C166E0FD1EA10009C7CA3 /* main_window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = main_window.h; path = ../../../source/main_window.h; sourceTree = SOURCE_ROOT; }; @@ -105,4 +103,6 @@ 308C556D0FEC412F00225AAD /* aeinstallerapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aeinstallerapp.h; path = ../../../source/aeinstallerapp.h; sourceTree = SOURCE_ROOT; }; 30C26B540FE08F1A003C85EA /* oni_special.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; name = oni_special.ico; path = ../../../source/oni_special.ico; sourceTree = SOURCE_ROOT; }; + 30E66655100540F70040501B /* about.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = about.cpp; path = ../../../source/about.cpp; sourceTree = SOURCE_ROOT; }; + 30E66656100540F70040501B /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../../source/about.h; sourceTree = SOURCE_ROOT; }; 32CA4F630368D1EE00C91783 /* AE Installer (GUI)_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AE Installer (GUI)_Prefix.pch"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -182,14 +182,13 @@ isa = PBXGroup; children = ( + 305BF37810E907C20044A9B1 /* globals.h */, 308C556C0FEC412F00225AAD /* aeinstallerapp.cpp */, 308C556D0FEC412F00225AAD /* aeinstallerapp.h */, - 306C16630FD1EA10009C7CA3 /* about_window.cpp */, - 306C16640FD1EA10009C7CA3 /* about_window.h */, + 30E66655100540F70040501B /* about.cpp */, + 30E66656100540F70040501B /* about.h */, 306C16650FD1EA10009C7CA3 /* app_resources.cpp */, 306C16660FD1EA10009C7CA3 /* app_resources.h */, 306C16690FD1EA10009C7CA3 /* installer.cpp */, 306C166A0FD1EA10009C7CA3 /* installer.h */, - 306C166B0FD1EA10009C7CA3 /* main.cpp */, - 306C166C0FD1EA10009C7CA3 /* main.h */, 306C166D0FD1EA10009C7CA3 /* main_window.cpp */, 306C166E0FD1EA10009C7CA3 /* main_window.h */, @@ -330,5 +329,5 @@ runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "/Users/mloudon/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/fix_dylibs.sh"; + shellScript = "/Users/mloudon/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/fix_dylibs.sh"; }; /* End PBXShellScriptBuildPhase section */ @@ -339,8 +338,9 @@ buildActionMask = 2147483647; files = ( - 306C16710FD1EA10009C7CA3 /* about_window.cpp in Sources */, 306C16720FD1EA10009C7CA3 /* app_resources.cpp in Sources */, 306C16770FD1EA10009C7CA3 /* main_window.cpp in Sources */, 308C556E0FEC412F00225AAD /* aeinstallerapp.cpp in Sources */, + 30E66657100540F80040501B /* about.cpp in Sources */, + 303936B310A260EA00501722 /* installer.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -405,5 +405,5 @@ GCC_PREFIX_HEADER = "AE Installer (GUI)_Prefix.pch"; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "/Games/Oni-Test/edition/install"; + INSTALL_PATH = "/Games/Oni-Test/Edition/install"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -432,5 +432,5 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CONFIGURATION_BUILD_DIR = "/Games/Oni-Test/edition/install"; + CONFIGURATION_BUILD_DIR = "/Games/Oni-Test/Edition/install"; DEPLOYMENT_LOCATION = YES; DSTROOT = /; @@ -446,10 +446,10 @@ "\"/Users/mloudon/Programming/Third-Party/Development/boost_1_39_0\"", ); - INSTALL_PATH = "/Games/Oni-Test/edition/install"; + INSTALL_PATH = "/Games/Oni-Test/Edition/install"; LD_RUNPATH_SEARCH_PATHS = ""; MACH_O_TYPE = mh_execute; MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( - "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal/lib/wx/include/mac-ansi-release-2.8", + "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal-10.6/lib/wx/include/mac-ansi-release-2.8", "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/include", "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/contrib/include", @@ -459,5 +459,5 @@ ); OTHER_LDFLAGS = ( - "-L/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal/lib", + "-L/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal-10.6/lib", "-framework", IOKit,