Skip to content

Commit 393ac15

Browse files
committed
Makefile fixes / vs arch
1 parent 92405e6 commit 393ac15

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

libs/openFrameworksCompiled/project/makefileCommon/config.shared.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,8 @@ ifdef MAKEFILE_DEBUG
222222
$(info OF_CORE_LIB_PATH=$(OF_CORE_LIB_PATH))
223223
endif
224224

225-
226-
$(info PLATFORM_LIB_SUBPATH=$(PLATFORM_LIB_SUBPATH))
227-
$(info OF_LIBS_OF_COMPILED_PROJECT_PATH=$(OF_LIBS_OF_COMPILED_PROJECT_PATH))
228-
229225
ifeq ($(wildcard $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH)),)
230-
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH)/$(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
226+
$(error This package doesn't support your platform, $(OF_LIBS_OF_COMPILED_PROJECT_PATH) / $(PLATFORM_LIB_SUBPATH) probably you downloaded the wrong package?)
231227
endif
232228

233229
# generate a list of valid core platform variants from the files in the platform makefiles directory

scripts/ci/vs/install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ SCRIPT_DIR="${BASH_SOURCE%/*}"
44

55
RELEASE="${RELEASE:-nightly}"
66
ARCH="${ARCH:-64}"
7+
if [[ "$ARCH" == "x64" ]]; then
8+
ARCH=64
9+
fi
10+
11+
712

813
if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi
914
. "$SCRIPT_DIR/../../dev/downloader.sh"

0 commit comments

Comments
 (0)