[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: use simple assignment for the SRC folder

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
ce5435a5 by Steve Lhomme at 2024-07-18T16:26:09+00:00
contrib: use simple assignment for the SRC folder

- - - - -
dbb1fff8 by Steve Lhomme at 2024-07-18T16:26:09+00:00
contrib: set the ARCH in the Makefile

It comes from the HOST which is hardcoded in the Makefile.

- - - - -
59d6d2bd by Steve Lhomme at 2024-07-18T16:26:09+00:00
contrib: set HAVE_WIN64 in the Makefile

It's tied to the ARCH value which comes from the HOST which is hardcoded in the
Makefile.

- - - - -


2 changed files:

- contrib/bootstrap
- contrib/src/main.mak


Changes:

=====================================
contrib/bootstrap
=====================================
@@ -331,6 +331,11 @@ case "${OS}" in
 				add_make_enabled "HAVE_WINSTORE"
 				;;
 		esac
+		case "${HOST}" in
+			*x86_64*|*aarch64*)
+				add_make_enabled "HAVE_WIN64"
+				;;
+		esac
 		case "${HOST}" in
 			armv7*)
 				add_make_enabled "HAVE_ARMV7A"
@@ -350,13 +355,17 @@ esac
 #
 BOOTSTRAP_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
 CURRENT_PATH="$( pwd -P )"
+
+ARCH=$("${BOOTSTRAP_PATH}/src/get-arch.sh" "${HOST}")
+add_make "ARCH := $ARCH"
+
 # location of the contrib/src folder from the root of the contrib build folder
 TOPSRC=$(python3 -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH'))")
 # location of the contrib/src folder from a built library folder
 TOPSRC_BUILT=$(python3 -c "import os; print(os.path.relpath('$BOOTSTRAP_PATH', '$CURRENT_PATH/libfoo'))")
-add_make "TOPSRC = $TOPSRC"
-add_make "TOPSRC_BUILT = $TOPSRC_BUILT"
-add_make "TOPDST = .."
+add_make "TOPSRC := $TOPSRC"
+add_make "TOPSRC_BUILT := $TOPSRC_BUILT"
+add_make "TOPDST := .."
 add_make "-include config.mak"
 add_make 'include $(TOPSRC)/src/main.mak'
 echo "Bootstrap completed."


=====================================
contrib/src/main.mak
=====================================
@@ -50,14 +50,6 @@ export PATH
 ifneq ($(HOST),$(BUILD))
 HAVE_CROSS_COMPILE = 1
 endif
-ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
-
-ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
-HAVE_WIN64 := 1
-endif
-ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
-HAVE_WIN64 := 1
-endif
 
 ifeq ($(findstring mingw32,$(BUILD)),mingw32)
 MSYS_BUILD := 1



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c9fd5edc278bc83ce0bb62a2e759029f7a610e51...59d6d2bdd3d335a4c8dcc585f5dbff72920563e6

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c9fd5edc278bc83ce0bb62a2e759029f7a610e51...59d6d2bdd3d335a4c8dcc585f5dbff72920563e6
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance