diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index ce442d0..500a3c7 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -31,7 +31,7 @@ pkbuild() { fi if [ "$PLATFORM" = "win" ]; then LOCAL_CMAKE_OPTIONS="$LOCAL_CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows" - LOCAL_PNG_LIB="libpng16.a" + LOCAL_PNG_LIB="libpng16.dll.a" LOCAL_GLUT_LIB="libfreeglut.dll.a" fi diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh index 9041720..1154e73 100644 --- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh +++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh @@ -39,7 +39,7 @@ pkinstall_release() { # copy files copy "$ENVDEPS_RELEASE_PACKET_DIR" "./" || return 1 - + # get version local LOCAL_VERSION_FULL=$(cat $ENVDEPS_RELEASE_PACKET_DIR/version-opentoonz-*) local LOCAL_VERSION=$(echo "$LOCAL_VERSION_FULL" | cut -d - -f 1) @@ -53,7 +53,7 @@ pkinstall_release() { # copy NSIS configuration cp "$FILES_PACKET_DIR/opentoonz.nsi" "./" || return 1 - + # create config.nsh (see opentoons.nsi) cat > config.nsh << EOF !define PK_NAME "OpenToonz" @@ -66,7 +66,7 @@ pkinstall_release() { EOF # let's go - makensis -INPUTCHARSET UTF8 opentoonz.nsi || return 1 + makensis opentoonz.nsi || return 1 # remove temporary dir cd "$INSTALL_RELEASE_PACKET_DIR" || return 1