12
12
# ----------------------------------------------------
13
13
# Variables setup
14
14
# ----------------------------------------------------
15
- SCRIPT_VER=" v0.9.1 "
15
+ SCRIPT_VER=" v0.9.2 "
16
16
COCOS2D_VER=" cocos2d-v3.0"
17
17
COCOS2D_DST_DIR=" cocos2d v3.x"
18
18
SCRIPT_DIR=" $( dirname $0 ) "
@@ -117,18 +117,19 @@ handle_error()
117
117
echo " "
118
118
echo " If you want to know more about how to use this script execute '$0 --help'."
119
119
elif [[ " $1 " -eq " 7" ]]; then
120
+ # Something bad happened, error notice
120
121
echo " ${UNDER} ${COLOREND} "
121
122
echo " "
122
123
echo " ${BOLD}${RED} Installation failed!${COLOREND} "
123
124
echo " Please, send an email containing your error.log on the support email (written in the --help)."
124
125
echo " It would make it easier for us to improve this script and fix the issues immediately."
125
126
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"
129
128
fi
130
129
echo " "
131
- exit " $1 "
130
+ if [[ " $1 " -ne " 7" ]]; then
131
+ exit " $1 "
132
+ fi
132
133
}
133
134
134
135
check_status ()
@@ -137,6 +138,7 @@ check_status()
137
138
printf " ${RED} ✖︎${COLOREND} "
138
139
handle_error 7
139
140
mv -f " ${ERROR_LOG} " " ${HOME} /Desktop/cocos2d-install.log"
141
+ exit 7
140
142
fi
141
143
}
142
144
@@ -322,20 +324,13 @@ if $INSTALL ; then
322
324
echo -n " ."
323
325
rm -rf " ${DOWNLOAD_DIR} " 1> /dev/null 2>> " ${ERROR_LOG} "
324
326
check_status
325
- printf " ${GREEN} ✔${COLOREND} \n"
327
+ printf " ${GREEN} ✔${COLOREND} \n"
326
328
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"
339
334
340
335
# Copy kazmath files
341
336
echo -n " ...copying kazmath files"
0 commit comments