Skip to content

Commit 1ca66c2

Browse files
author
Dominik Hadl
committed
Added new audio library to templates
Former-commit-id: 73eda14
1 parent bba2931 commit 1ca66c2

File tree

8 files changed

+1650
-317
lines changed

8 files changed

+1650
-317
lines changed

external/TemplateInfo.plist

Lines changed: 817 additions & 0 deletions
Large diffs are not rendered by default.

external/kazmath_neon.patch

Lines changed: 0 additions & 98 deletions
This file was deleted.

install.sh

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# ----------------------------------------------------
1313
# Variables setup
1414
# ----------------------------------------------------
15-
SCRIPT_VER="v0.9.1"
15+
SCRIPT_VER="v0.9.2"
1616
COCOS2D_VER="cocos2d-v3.0"
1717
COCOS2D_DST_DIR="cocos2d v3.x"
1818
SCRIPT_DIR="$(dirname $0)"
@@ -117,18 +117,19 @@ handle_error()
117117
echo ""
118118
echo "If you want to know more about how to use this script execute '$0 --help'."
119119
elif [[ "$1" -eq "7" ]]; then
120+
# Something bad happened, error notice
120121
echo "${UNDER} ${COLOREND}"
121122
echo ""
122123
echo "${BOLD}${RED}Installation failed!${COLOREND}"
123124
echo "Please, send an email containing your error.log on the support email (written in the --help)."
124125
echo "It would make it easier for us to improve this script and fix the issues immediately."
125126
echo ""
126-
echo "Your error log is located at: ${ERROR_LOG}"
127-
echo ""
128-
exit 7
127+
echo "Your error log is located at: ${HOME}/Desktop/cocos2d-install.log"
129128
fi
130129
echo ""
131-
exit "$1"
130+
if [[ "$1" -ne "7" ]]; then
131+
exit "$1"
132+
fi
132133
}
133134

134135
check_status()
@@ -137,6 +138,7 @@ check_status()
137138
printf " ${RED}✖︎${COLOREND}"
138139
handle_error 7
139140
mv -f "${ERROR_LOG}" "${HOME}/Desktop/cocos2d-install.log"
141+
exit 7
140142
fi
141143
}
142144

@@ -322,20 +324,13 @@ if $INSTALL ; then
322324
echo -n "."
323325
rm -rf "${DOWNLOAD_DIR}" 1>/dev/null 2>>"${ERROR_LOG}"
324326
check_status
325-
printf " ${GREEN}${COLOREND}\n"
327+
printf " ${GREEN}${COLOREND}\n"
326328

327-
# DISABLED
328-
# CocosDenshion isn't ARC, so it does not compile with the rest of library.
329-
# There is no way right now how to specify compiler flags in Xcode templates,
330-
# so the only options are:
331-
# 1. Convert to ARC
332-
# 2. Replace with better audio engine
333-
334-
# Copy CocosDenshion files
335-
# echo "...copying CocosDenshion files"
336-
# LIBS_DIR="$DST_DIR/Support/Libraries/lib_cocosdenshion.xctemplate/Libraries/"
337-
# copy_files "CocosDenshion" "$LIBS_DIR"
338-
# copy_files "LICENSE_CocosDenshion.txt" "$LIBS_DIR"
329+
# Copy ObjectAL files
330+
echo -n "...copying ObjectAL files"
331+
LIBS_DIR="$DST_DIR/Support/Libraries/lib_objectal.xctemplate/Libraries/"
332+
copy_files "external/ObjectAL" "$LIBS_DIR"
333+
printf " ${GREEN}${COLOREND}\n"
339334

340335
# Copy kazmath files
341336
echo -n "...copying kazmath files"

templates/Support/Base/base_osx.xctemplate/TemplateInfo.plist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<string>QuartzCore</string>
5454
<string>OpenGL</string>
5555
<string>OpenAL</string>
56+
<string>AVFoundation</string>
5657
<string>AudioToolbox</string>
5758
<string>AppKit</string>
5859
<string>Foundation</string>

templates/Support/Libraries/lib_cocosdenshion.xctemplate/TemplateInfo.plist

Lines changed: 0 additions & 197 deletions
This file was deleted.

0 commit comments

Comments
 (0)