Skip to content

Commit

Permalink
Add 7z archives of IrrXML libs
Browse files Browse the repository at this point in the history
  • Loading branch information
dmsurti committed Sep 2, 2017
1 parent a167fd8 commit 34e16bf
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 7 deletions.
Binary file added AssimpKit/Assimp/lib/ios/libIrrXML-fat.7z
Binary file not shown.
3 changes: 0 additions & 3 deletions AssimpKit/Assimp/lib/ios/libIrrXML-fat.a

This file was deleted.

Binary file added AssimpKit/Assimp/lib/osx/libIrrXML.7z
Binary file not shown.
3 changes: 0 additions & 3 deletions AssimpKit/Assimp/lib/osx/libIrrXML.a

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "#!/bin/sh&#10;echo Extracting iOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/ios/libIrrXML-fat.a&#10;7z x $PROJECT_DIR/../Assimp/lib/ios/libIrrXML-fat.7z&#10;mv $PROJECT_DIR/libIrrXML-fat.a $PROJECT_DIR/../Assimp/lib/ios/">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "779DF1D21DDF29F200DED366"
BuildableName = "AssimpKit.framework"
BlueprintName = "AssimpKit-iOS"
ReferencedContainer = "container:Library.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PreActions>
<BuildActionEntries>
<BuildActionEntry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,23 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;cd $PROJECT_DIR&#10;echo &quot;$PROJECT_DIR&quot;&#10;rm $PROJECT_DIR/../Assimp/lib/osx/libassimp.a&#10;7z x $PROJECT_DIR/../Assimp/lib/osx/libassimp.7z&#10;mv $PROJECT_DIR/libassimp.a $PROJECT_DIR/../Assimp/lib/osx/">
scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/osx/libassimp.a&#10;7z x $PROJECT_DIR/../Assimp/lib/osx/libassimp.7z&#10;mv $PROJECT_DIR/libassimp.a $PROJECT_DIR/../Assimp/lib/osx/">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "779DF1FA1DDF2B8700DED366"
BuildableName = "AssimpKit.framework"
BlueprintName = "AssimpKit-macOS"
ReferencedContainer = "container:Library.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "#!/bin/sh&#10;echo Extracting macOS fat lib...&#10;cd $PROJECT_DIR&#10;rm $PROJECT_DIR/../Assimp/lib/osx/libIrrXML.a&#10;7z x $PROJECT_DIR/../Assimp/lib/osx/libIrrXML.7z&#10;mv $PROJECT_DIR/libIrrXML.a $PROJECT_DIR/../Assimp/lib/osx/">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
Expand Down

2 comments on commit 34e16bf

@bdgeyter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note that this script assumes having 7z installed, which isn't the case by default on MacOS. This effectively breaks the project from building. This should be added as a dependency in the docs, and the script should check if 7z is installed and throw an appropriate warning.

@dmsurti
Copy link
Owner Author

@dmsurti dmsurti commented on 34e16bf Sep 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bdgeyter Yes, this is coming in patch version 1.2.1. Thanks!

Please sign in to comment.