Windows: install taglib in app folder instead of globally

UltraStar-Deluxe · May 30, 2024 · 5f619d3 · 5f619d3
1 parent 8f47258
commit 5f619d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,6 +26,8 @@ jobs:
           cd taglib
           cmake -B build -G "Visual Studio 17 2022" -A x64 -DWITH_ZLIB=OFF -DBUILD_SHARED_LIBS=ON -DENABLE_STATIC_RUNTIME=OFF -DBUILD_TESTING=OFF
           msbuild build/install.vcxproj -p:Configuration=Release
+          copy "C:/Program Files/taglib/include/taglib" ../include
+          copy "C:/Program Files/taglib/lib/tag.dll" ../lib/win64
       - name: Install cld2
         run: |
           git clone https://github.com/CLD2Owners/cld2.git

diff --git a/setup/win64/UltraStar-Creator.nsi b/setup/win64/UltraStar-Creator.nsi
@@ -65,6 +65,7 @@ Section "Application" SecCopyUI
 	File "capi.dll"
 	File "changes.txt"
 	File "cld2.dll"
+	File "tag.dll"
 	File "dasync.dll"
 	File "English.txt"
 	File "French.txt"
@@ -108,8 +109,6 @@ Section "Application" SecCopyUI
 	File "tls\qcertonlybackend.dll" ;; needed?
 	File "tls\qopensslbackend.dll" ;; needed?
 	File "tls\qschannelbackend.dll" ;; needed?
-	SetOutPath "C:\Program Files\taglib\lib"
-	File "tag.dll"
 
 	;; setup initial reg values
 	;; WriteRegStr HKCU "Software\HPI\${PRODUCTNAME}" "key" "value1 value2"
@@ -170,6 +169,7 @@ Section "Uninstall"
 
 	Delete "$INSTDIR\bass.dll"
 	Delete "$INSTDIR\bass_fx.dll"
+	Delete "$INSTDIR\tag.dll"
 	Delete "$INSTDIR\changes.txt"
 	Delete "$INSTDIR\libgcc_s_seh-1.dll"
 	Delete "$INSTDIR\libstdc++-6.dll"

diff --git a/src/UltraStar-Creator.pro b/src/UltraStar-Creator.pro
@@ -77,14 +77,13 @@ INCLUDEPATH += ../include/bass \
 	../include/srtparser
 
 win32 {
-	INCLUDEPATH += "C:/Program Files/taglib/include/taglib"
+	INCLUDEPATH += ../include/taglib
 
-	LIBS += -L"C:/Program Files/taglib/lib" \
-		-ltag
 	LIBS += -L"../lib/win64" \
 		-lbass \
 		-lbass_fx \
-		-lcld2
+		-lcld2 \
+		-ltag
 
 	RC_ICONS += UltraStar-Creator.ico
 }
@@ -172,7 +171,7 @@ win32 {
 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../lib/win64/bass.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)
 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../lib/win64/bass_fx.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)
 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../lib/win64/cld2.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)
- 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../taglib/build/taglib/Release/tag.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)
+ 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../lib/win64/tag.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)
 
 	# Copy SSL/TLS libraries
 	QMAKE_POST_LINK += $${QMAKE_COPY} $$shell_path(../lib/win64/capi.dll) $$shell_path($${DESTDIR}) $$escape_expand(\\n\\t)