Qbs: Resolved naming conflict for libtiled on Windows (#3832)

The tiled.dll pdb file had the same name as the one for tiled.exe. Co-authored-by: Jesse Tremblay <jessetrem@gmail.com>
mapeditor · Oct 20, 2023 · f1fb902 · f1fb902
1 parent d713672
commit f1fb902
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dist/win/installer.wxs b/dist/win/installer.wxs
@@ -80,7 +80,7 @@
               <Shortcut Id="startmenuTiled" Directory="ProgramMenuFolder" Name="Tiled" WorkingDirectory='INSTALLDIR' Icon="tiled.exe" IconIndex="0" Advertise="yes" />
             </File>
             <File Source="$(var.InstallRoot)\terraingenerator.exe" />
-            <File Source="$(var.InstallRoot)\tiled.dll" />
+            <File Source="$(var.InstallRoot)\libtiled.dll" />
             <File Source="$(var.InstallRoot)\tilededitor.dll" />
             <File Source="$(var.InstallRoot)\tmxrasterizer.exe" />
             <File Source="$(var.InstallRoot)\tmxviewer.exe" />

diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
@@ -2,6 +2,7 @@ import qbs.Probes as Probes
 
 DynamicLibrary {
     targetName: "tiled"
+    cpp.dynamicLibraryPrefix: "lib"
 
     Depends { name: "cpp" }
     Depends { name: "Qt"; submodules: "gui"; versionAtLeast: "5.12" }