Pr/windows

.github/workflows/main.yml

@@ -238,10 +238,17 @@ jobs:
           run: |
             cd build
             cmake --install . --component voxedit --prefix voxedit-install
+            cmake --install . --component thumbnailer --prefix thumbnailer-install
             cmake --install . --component voxconvert --prefix voxconvert-install
             cmake --install . --component voxbrowser --prefix voxbrowser-install
             cpack
 
+        - name: Upload the vengi msi
+          uses: actions/upload-artifact@v4
+          with:
+            name: win-vengi-msi
+            path: build/vengi.msi
+
         - name: Upload the voxedit artifacts
           uses: actions/upload-artifact@v4
           with:
@@ -267,11 +274,11 @@ jobs:
             name: win-voxbrowser
             path: build/voxbrowser-install/
 
-        - name: Upload the nsis installer artifacts
+        - name: Upload the thumbnailer artifacts
           uses: actions/upload-artifact@v4
           with:
-            name: win-installer
-            path: build/vengi-*-Windows.exe
+            name: win-thumbnailer
+            path: build/thumbnailer-install/
 
     windows-debug:
         timeout-minutes: 45

cmake/macros.cmake

@@ -1,6 +1,6 @@
 function(engine_install TARGET FILE DESTINATION INSTALL_DATA)
 	if (WIN32)
-		set(INSTALL_DATA_DIR ".")
+		set(INSTALL_DATA_DIR "${TARGET}")
 	else()
 		set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}-${TARGET}")
 	endif()
@@ -176,11 +176,11 @@ function(engine_add_executable)
 	endif()
 
 	if (WIN32)
-		set(INSTALL_DATA_DIR ".")
-		set(INSTALL_ICON_DIR ".")
+		set(INSTALL_DATA_DIR "${_EXE_TARGET}")
+		set(INSTALL_ICON_DIR "${_EXE_TARGET}")
 		set(INSTALL_APPLICATION_DIR "unused")
 		set(INSTALL_METAINFO_DIR "unused")
-		set(INSTALL_BIN_DIR ".")
+		set(INSTALL_BIN_DIR "${_EXE_TARGET}")
 	elseif(APPLE)
 		set(INSTALL_DATA_DIR ".")
 		set(INSTALL_ICON_DIR "unused")
@@ -452,7 +452,7 @@ function(engine_install_deps TARGET)
 	set(DEPS ${ARGN})
 	list(APPEND DEPS ${TARGET})
 	if (WIN32)
-		set(INSTALL_DATA_DIR ".")
+		set(INSTALL_DATA_DIR "${TARGET}")
 	else()
 		set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}-${TARGET}")
 	endif()

cmake/pack.cmake

@@ -47,7 +47,8 @@ elseif (WIN32)
 	set(CPACK_WIX_PRODUCT_ICON "${ROOT_DIR}/contrib/installer/vengi-icon.ico")
 	set(CPACK_WIX_UI_BANNER "${ROOT_DIR}/contrib/installer/vengi-banner-493x58.png")
 	set(CPACK_WIX_UI_DIALOG "${ROOT_DIR}/contrib/installer/vengi-banner-493x312.png")
-	set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT  "https://vengi-voxel.github.io/vengi")
+	set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://vengi-voxel.github.io/vengi")
+	set(CPACK_WIX_PATCH_FILE "${ROOT_DIR}/contrib/installer/windows/wixpatch.xml")
 	set(CPACK_WIX_CULTURES "en-US;de-DE")
 	# guids were generated by cmake
 	set(CPACK_WIX_UPGRADE_GUID "9F20CEE6-8CF0-4618-922F-47942B336330")

contrib/installer/linux/thumbnailer.thumbnailer.in

@@ -1,4 +1,4 @@
 [Thumbnailer Entry]
 TryExec=@CMAKE_PROJECT_NAME@-@NAME@
 Exec=@CMAKE_PROJECT_NAME@-@NAME@ --use-scene-camera -s %s --input %i --output %o
-MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms.xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object
+MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms-xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object

contrib/installer/linux/voxedit.desktop.in

@@ -10,4 +10,4 @@ Type=Application
 Keywords=3D;modeling;voxel;engine;pixel;art
 Categories=Graphics;2DGraphics;3DGraphics;RasterGraphics;
 StartupNotify=true
-MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms.xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object
+MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms-xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object

contrib/installer/linux/x-voxel.xml

@@ -248,7 +248,7 @@
 		<comment>Voxel3D</comment>
 		<glob pattern="*.v3a"/>
 	</mime-type>
-	<mime-type type="application/x-rooms.xyz-thing">
+	<mime-type type="application/x-rooms-xyz-thing">
 		<comment>Rooms.xyz Thing</comment>
 		<glob pattern="*.thing"/>
 	</mime-type>