Changeset 513


Ignore:
Timestamp:
Apr 25, 2010, 2:23:40 PM (15 years ago)
Author:
iritscen
Message:

Ooh, commit #29. Updated Mac project files, fixed small About box text glitch.

Location:
AE/Installer/trunk
Files:
3 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • AE/Installer/trunk/projects/README-Mac.txt

    r386 r513  
    11== Building the AE Installer for the Macintosh ==
    2 last updated June.06.2009
     2last updated April.25.2010
    33by Iritscen (iritscen@oni2.net)
    44
    55Requirements: An Intel Macintosh computer, preferably with Mac OS X 10.5 or higher, and an administrator password. Mono must be installed to run the built product.
    6 
    7 Note: At the moment, the project is still in flux. I am planning to eventually set up the project to build a Universal application, not an Intel-only one. However, such a project may still require an Intel Mac to build the Installer.
    86
    971. Preparing to build the Installer.
    … …  
    24221.    mkdir build-dynamic-universal
    25232.    cd build-dynamic-universal
    26 3.    ../configure --with-opengl --enable-universal_binary --with-macosx-version-min=10.3.9 --with-macosx-sdk=/Developer/SDKs/MacOSX10.4u.sdk --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin
     243.    ../configure CC=gcc-4.0 CXX=g++-4.0 LD=g++-4.0 --with-opengl --enable-universal_binary --with-macosx-version-min=10.4 --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin
    27254.    sudo make
    2826      After all above commands have finished, check in build-dynamic-universal/lib/ for files that start with "libwx_mac" to ensure the build was successful.
    … …  
    3129      The libiconv project is at http://www.gnu.org/software/libiconv/. From the expanded folder's directory, use the commands:
    32301.    mkdir build-static-universal
    33 2.    ./configure --enable-static --prefix=/Users/mloudon/Programming/Third-Party/Development/libiconv-1.13/build-static-universal CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" CPP="gcc -E" CXXCPP="g++ -E"
     312.    ./configure --enable-static --prefix=[full path to build-static-universal] CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" CPP="gcc -E" CXXCPP="g++ -E"
    34323.    sudo make
    35334.    make install
    … …  
    41393. Building the Installer.
    4240   If you are able to use the included .xcodeproj file, then you will need to change the directory in which the build takes place. Get info on the project and change the settings "Per-configuration Build Products Path" and "Installation Directory" to point to the folders of your choosing.
    43    Once built, Installer.app must be moved to the edition/install/ folder inside your Oni installation, alongside the packages/ folder and OniSplit.exe, in order to work.
     41   The next thing you need to do before building is update the path strings in fix_dylibs.sh to reflect the locations of your project files and supporting libraries.
     42   Once built, Installer.app must be moved to the Edition/install/ folder inside your Oni installation, alongside the packages/ folder and OniSplit.exe, in order to work.

  • AE/Installer/trunk/projects/xcode/AE_Installer-GUI/AE Installer (GUI).xcodeproj/project.pbxproj

    r386 r513  
    99/* Begin PBXBuildFile section */
    1010                1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
     11                303936B310A260EA00501722 /* installer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16690FD1EA10009C7CA3 /* installer.cpp */; };
    1112                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 */; };
    1213                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 */; };
    … …  
    3031                3057E95A0FFC505800299C97 /* libboost_system-xgcc40-mt-1_39.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3057E93E0FFC502600299C97 /* libboost_system-xgcc40-mt-1_39.dylib */; };
    3132                3057EA2310017F9D00299C97 /* AE Button.icns in Resources */ = {isa = PBXBuildFile; fileRef = 3057EA2210017F9D00299C97 /* AE Button.icns */; };
    32                 306C16710FD1EA10009C7CA3 /* about_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16630FD1EA10009C7CA3 /* about_window.cpp */; };
    3333                306C16720FD1EA10009C7CA3 /* app_resources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 306C16650FD1EA10009C7CA3 /* app_resources.cpp */; };
    3434                306C16730FD1EA10009C7CA3 /* fileopen.xpm in Resources */ = {isa = PBXBuildFile; fileRef = 306C16670FD1EA10009C7CA3 /* fileopen.xpm */; };
    … …  
    3939                308C556E0FEC412F00225AAD /* aeinstallerapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 308C556C0FEC412F00225AAD /* aeinstallerapp.cpp */; };
    4040                30C26B550FE08F1A003C85EA /* oni_special.ico in Resources */ = {isa = PBXBuildFile; fileRef = 30C26B540FE08F1A003C85EA /* oni_special.ico */; };
     41                30E66657100540F80040501B /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 30E66655100540F70040501B /* about.cpp */; };
    4142                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
    4243                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
    … …  
    8889                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; };
    8990                3057EA2210017F9D00299C97 /* AE Button.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "AE Button.icns"; sourceTree = "<group>"; };
    90                 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; };
    91                 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; };
     91                305BF37810E907C20044A9B1 /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = globals.h; path = ../../../source/globals.h; sourceTree = SOURCE_ROOT; };
    9292                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; };
    9393                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; };
    … …  
    9696                306C16690FD1EA10009C7CA3 /* installer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = installer.cpp; path = ../../../source/installer.cpp; sourceTree = SOURCE_ROOT; };
    9797                306C166A0FD1EA10009C7CA3 /* installer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = installer.h; path = ../../../source/installer.h; sourceTree = SOURCE_ROOT; };
    98                 306C166B0FD1EA10009C7CA3 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; name = main.cpp; path = ../../../source/main.cpp; sourceTree = SOURCE_ROOT; };
    99                 306C166C0FD1EA10009C7CA3 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = main.h; path = ../../../source/main.h; sourceTree = SOURCE_ROOT; };
    10098                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; };
    10199                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; };
    … …  
    105103                308C556D0FEC412F00225AAD /* aeinstallerapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aeinstallerapp.h; path = ../../../source/aeinstallerapp.h; sourceTree = SOURCE_ROOT; };
    106104                30C26B540FE08F1A003C85EA /* oni_special.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; name = oni_special.ico; path = ../../../source/oni_special.ico; sourceTree = SOURCE_ROOT; };
     105                30E66655100540F70040501B /* about.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = about.cpp; path = ../../../source/about.cpp; sourceTree = SOURCE_ROOT; };
     106                30E66656100540F70040501B /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../../source/about.h; sourceTree = SOURCE_ROOT; };
    107107                32CA4F630368D1EE00C91783 /* AE Installer (GUI)_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AE Installer (GUI)_Prefix.pch"; sourceTree = "<group>"; };
    108108                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    … …  
    182182                        isa = PBXGroup;
    183183                        children = (
     184                                305BF37810E907C20044A9B1 /* globals.h */,
    184185                                308C556C0FEC412F00225AAD /* aeinstallerapp.cpp */,
    185186                                308C556D0FEC412F00225AAD /* aeinstallerapp.h */,
    186                                 306C16630FD1EA10009C7CA3 /* about_window.cpp */,
    187                                 306C16640FD1EA10009C7CA3 /* about_window.h */,
     187                                30E66655100540F70040501B /* about.cpp */,
     188                                30E66656100540F70040501B /* about.h */,
    188189                                306C16650FD1EA10009C7CA3 /* app_resources.cpp */,
    189190                                306C16660FD1EA10009C7CA3 /* app_resources.h */,
    190191                                306C16690FD1EA10009C7CA3 /* installer.cpp */,
    191192                                306C166A0FD1EA10009C7CA3 /* installer.h */,
    192                                 306C166B0FD1EA10009C7CA3 /* main.cpp */,
    193                                 306C166C0FD1EA10009C7CA3 /* main.h */,
    194193                                306C166D0FD1EA10009C7CA3 /* main_window.cpp */,
    195194                                306C166E0FD1EA10009C7CA3 /* main_window.h */,
    … …  
    330329                        runOnlyForDeploymentPostprocessing = 0;
    331330                        shellPath = /bin/bash;
    332                         shellScript = "/Users/mloudon/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/fix_dylibs.sh";
     331                        shellScript = "/Users/mloudon/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/fix_dylibs.sh";
    333332                };
    334333/* End PBXShellScriptBuildPhase section */
    … …  
    339338                        buildActionMask = 2147483647;
    340339                        files = (
    341                                 306C16710FD1EA10009C7CA3 /* about_window.cpp in Sources */,
    342340                                306C16720FD1EA10009C7CA3 /* app_resources.cpp in Sources */,
    343341                                306C16770FD1EA10009C7CA3 /* main_window.cpp in Sources */,
    344342                                308C556E0FEC412F00225AAD /* aeinstallerapp.cpp in Sources */,
     343                                30E66657100540F80040501B /* about.cpp in Sources */,
     344                                303936B310A260EA00501722 /* installer.cpp in Sources */,
    345345                        );
    346346                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    405405                                GCC_PREFIX_HEADER = "AE Installer (GUI)_Prefix.pch";
    406406                                INFOPLIST_FILE = Info.plist;
    407                                 INSTALL_PATH = "/Games/Oni-Test/edition/install";
     407                                INSTALL_PATH = "/Games/Oni-Test/Edition/install";
    408408                                LIBRARY_SEARCH_PATHS = (
    409409                                        "$(inherited)",
    … …  
    432432                        buildSettings = {
    433433                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
    434                                 CONFIGURATION_BUILD_DIR = "/Games/Oni-Test/edition/install";
     434                                CONFIGURATION_BUILD_DIR = "/Games/Oni-Test/Edition/install";
    435435                                DEPLOYMENT_LOCATION = YES;
    436436                                DSTROOT = /;
    … …  
    446446                                        "\"/Users/mloudon/Programming/Third-Party/Development/boost_1_39_0\"",
    447447                                );
    448                                 INSTALL_PATH = "/Games/Oni-Test/edition/install";
     448                                INSTALL_PATH = "/Games/Oni-Test/Edition/install";
    449449                                LD_RUNPATH_SEARCH_PATHS = "";
    450450                                MACH_O_TYPE = mh_execute;
    451451                                MACOSX_DEPLOYMENT_TARGET = 10.3;
    452452                                OTHER_CFLAGS = (
    453                                         "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal/lib/wx/include/mac-ansi-release-2.8",
     453                                        "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal-10.6/lib/wx/include/mac-ansi-release-2.8",
    454454                                        "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/include",
    455455                                        "-I/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/contrib/include",
    … …  
    459459                                );
    460460                                OTHER_LDFLAGS = (
    461                                         "-L/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal/lib",
     461                                        "-L/Users/mloudon/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal-10.6/lib",
    462462                                        "-framework",
    463463                                        IOKit,

  • AE/Installer/trunk/projects/xcode/AE_Installer-GUI/fix_dylibs.sh

    r386 r513  
    99APPNAME="Installer"
    1010
    11 WXLIBDIR=~/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal/lib
     11WXLIBDIR=~/Programming/Third-Party/Development/wxMac-2.8.10/build-dynamic-universal-10.6/lib
    1212BOOSTLIBDIR=~/Programming/Third-Party/Development/boost_1_39_0/build-dynamic-universal
    13 BINDIR=/Games/Oni-Test/edition/install/$APPNAME.app/Contents/MacOS
     13BINDIR=/Games/Oni-Test/Edition/install/$APPNAME.app/Contents/MacOS
    1414SYSLIBDIR=/usr/local/lib
    1515
    … …  
    1818cp -R $WXLIBDIR/$WXLIBNAME_ALL $BINDIR
    1919
    20 for file in `cat ~/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
     20for file in `cat ~/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
    2121do
    2222   cp -R $BOOSTLIBDIR/$file$BOOST_SUFFIX $BINDIR
    … …  
    2626cp ~/Programming/Third-Party/Development/libiconv-1.13/build-static-universal/lib/libiconv.2.dylib $BINDIR
    2727
    28 for file in `cat ~/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-wx.txt`
     28for file in `cat ~/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-wx.txt`
    2929do
    3030   echo "Patching " $file "..."
    31    for fileother in `cat ~/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-wx.txt`
     31   for fileother in `cat ~/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-wx.txt`
    3232   do
    3333      # patch all library internal cross references
    … …  
    4242done
    4343
    44 for file in `cat ~/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
     44for file in `cat ~/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
    4545do
    4646   echo "Patching " $file "..."
    47    for fileother in `cat ~/Programming/Pre-Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
     47   for fileother in `cat ~/Programming/Release/AE_Installer/projects/xcode/AE_Installer-GUI/libnames-boost.txt`
    4848   do
    4949      # patch all library internal cross references

  • AE/Installer/trunk/source/about.cpp

    r512 r513  
    118118                                                        "geyser: Original AE framework\n" +
    119119                                                        "Gumby: General AE framework, Windows Installer, add'l Daodan DLL coding\n" +
    120                                                         "Iritscen: Mac port of Installer & add'l Installer coding\n" +
     120                                                        "Iritscen: Mac port of Installer, add'l Installer coding\n" +
    121121                                                        "Loser: Improved combat animation and AI\n" +
    122122                                                        "Neo: OniSplit, documenting Oni, tech support\n" +
Note: See TracChangeset for help on using the changeset viewer.