diff --git a/build.bat b/build.bat index c79d926..af3a133 100644 --- a/build.bat +++ b/build.bat @@ -4,4 +4,4 @@ call cmake -DCMAKE_BUILD_TYPE=Release -A x64 -Ssrc -Brelease call cmake --build release --config Release -call zip -r release/ImageToMapMC-1.3.6-Windows-x64.zip release/Release +call zip -r release/ImageToMapMC-1.3.7-Windows-x64.zip release/Release diff --git a/build.sh b/build.sh index b9f8bdc..f760559 100755 --- a/build.sh +++ b/build.sh @@ -8,13 +8,13 @@ cmake --build release --config Release rm -rf release/bin || true -rm -rf release/ImageToMapMC-1.3.6-linux-x64.tar.gz || true +rm -rf release/ImageToMapMC-1.3.7-linux-x64.tar.gz || true mkdir release/bin cp release/mcmap release/bin/mcmap cp release/mcmap-gui release/bin/mcmap-gui -tar -cvzf release/ImageToMapMC-1.3.6-linux-x64.tar.gz release/bin +tar -cvzf release/ImageToMapMC-1.3.7-linux-x64.tar.gz release/bin -echo "DONE: Created release ImageToMapMC-1.3.6-linux-x64.tar.gz" +echo "DONE: Created release ImageToMapMC-1.3.7-linux-x64.tar.gz" diff --git a/build32.bat b/build32.bat index 05bed4b..2594de1 100644 --- a/build32.bat +++ b/build32.bat @@ -4,4 +4,4 @@ call cmake -DCMAKE_BUILD_TYPE=Release -A Win32 -Ssrc -Brelease32 call cmake --build release32 --config Release -call zip -r release32/ImageToMapMC-1.3.6-Windows-Win32.zip release32/Release +call zip -r release32/ImageToMapMC-1.3.7-Windows-Win32.zip release32/Release diff --git a/wix/Product.wxs b/wix/Product.wxs index 84e3abc..9bef3fd 100644 --- a/wix/Product.wxs +++ b/wix/Product.wxs @@ -2,7 +2,7 @@ - + diff --git a/wix/make-wix-installer.bat b/wix/make-wix-installer.bat index fe3ff8a..58c67ac 100644 --- a/wix/make-wix-installer.bat +++ b/wix/make-wix-installer.bat @@ -8,4 +8,4 @@ call candle -ext WixUIExtension -ext WixUtilExtension -arch x64 "HeatFile.wxs" - call candle -ext WixUIExtension -ext WixUtilExtension -arch x64 "Product.wxs" -o "Product.wixobj" -call light "Product.wixobj" -spdb "HeatFile.wixobj" -b ImageToMapMC -o "ImageToMapMC-1.3.6-x64.msi" -ext WixUIExtension -ext WixUtilExtension +call light "Product.wixobj" -spdb "HeatFile.wixobj" -b ImageToMapMC -o "ImageToMapMC-1.3.7-x64.msi" -ext WixUIExtension -ext WixUtilExtension diff --git a/ws.code-workspace b/ws.code-workspace index 3fce872..f5008a2 100644 --- a/ws.code-workspace +++ b/ws.code-workspace @@ -17,6 +17,7 @@ "release32": true }, "files.associations": { + "*.ejs": "html", "string": "cpp", "cctype": "cpp", "cmath": "cpp", @@ -87,7 +88,15 @@ "mutex": "cpp", "thread": "cpp", "codecvt": "cpp", - "*.xpm": "cpp" + "*.xpm": "cpp", + "bit": "cpp", + "charconv": "cpp", + "clocale": "cpp", + "compare": "cpp", + "format": "cpp", + "forward_list": "cpp", + "optional": "cpp", + "stop_token": "cpp" }, } } \ No newline at end of file