Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

making builds work.

  • Loading branch information...
commit 98c6406d540e6ee325f87eb222fd56e41f746cbe 1 parent 177533b
@probablycorey authored
View
11 lib/build-scripts/copy-scripts.sh
@@ -14,7 +14,7 @@ if [ -d "$PROJECT_DIR/data/scripts" ]; then
fi
# If the user has luac installed, preparse the lua files and make sure they are cool
-if type luac &> /dev/null; then;
+if type luac &> /dev/null; then;
LUAC_OUTPUT=$(luac -p -- "$SOURCE_SCRIPTS_DIR"/**/*.lua 2>&1)
LUAC_EXIT_VALUE=$?
if [ $LUAC_EXIT_VALUE != 0 ] ; then
@@ -32,16 +32,19 @@ mkdir -p "$DESTINATION_SCRIPTS_DIR"
if [ $WAX_COMPILE_SCRIPTS ]; then
echo "note: Wax is using compiled Lua scripts."
- # This requires that you run a special build of lua. Since snow leopard is 64-bit
+ # This requires that you run a special build of lua. Since snow leopard is 64-bit
# and iOS is 32-bit, luac files compiled on snow leopard won't work on iOS
-
+
lua "$PROJECT_DIR/wax/lib/build-scripts/luac.lua" wax wax.dat "$PROJECT_DIR/wax/lib/stdlib/" "$PROJECT_DIR/wax/lib/stdlib/init.lua" -L "$PROJECT_DIR/wax/lib/stdlib"/**/*.lua
lua "$PROJECT_DIR/wax/lib/build-scripts/luac.lua" "" AppDelegate.dat "$SOURCE_SCRIPTS_DIR/" "$SOURCE_SCRIPTS_DIR/AppDelegate.lua" -L "$SOURCE_SCRIPTS_DIR"/**/*.lua
mv AppDelegate.dat "$DESTINATION_SCRIPTS_DIR"
mv wax.dat "$DESTINATION_SCRIPTS_DIR"
else
# copy everything in the data dir to the app (doesn't just have to be lua files, can be images, sounds, etc...)
- cp -r "$PROJECT_DIR/wax/lib/stdlib" "$DESTINATION_SCRIPTS_DIR/wax"
+ if [[ -d "$PROJECT_DIR/wax" ]]; then;
+ # If we are using the framework, there is no wax dir
+ cp -r "$PROJECT_DIR/wax/lib/stdlib" "$DESTINATION_SCRIPTS_DIR/wax"
+ fi
cp -r "$SOURCE_SCRIPTS_DIR/" "$DESTINATION_SCRIPTS_DIR"
fi
View
4 lib/wax_stdlib.h
3 additions, 1 deletion not shown
View
6 tools/Framework/Scripts/build
@@ -1,6 +1,4 @@
#!/bin/bash
-SDK_VERSION=4.2
-
-xcodebuild -configuration Release -target "Wax" -sdk iphoneos$SDK_VERSION
-xcodebuild -configuration Release -target "Wax" -sdk iphonesimulator$SDK_VERSION
+xcodebuild -configuration Release -target "Wax" -sdk iphoneos
+xcodebuild -configuration Release -target "Wax" -sdk iphonesimulator
Please sign in to comment.
Something went wrong with that request. Please try again.