Updated.

scripts/common.bat

@@ -1,11 +1,2 @@
 
 set mx2cc=..\bin\mx2cc_windows.exe
-set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.1.07\windows_release\mx2cc.exe
-set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.1.07\raspbian_release\mx2cc
-
-set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.1.07\windows_release
-set ted2go_new=..\src\ted2go\Ted2.buildv1.1.07\windows_release
-
-set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.1.07\windows_release\launcher.exe

scripts/common.sh

@@ -8,8 +8,8 @@ launcher_new=""
 
 if [ "$OSTYPE" = "linux-gnu" ]
 then
+	host="linux"
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.1.07/linux_release/mx2cc"
 	
 	ted2="../bin/ted2_linux"
 	ted2_new="../src/ted2/ted2.buildv1.1.07/linux_release"
@@ -20,8 +20,8 @@ then
 	
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
+	host="raspbian"
 	mx2cc="../bin/mx2cc_raspbian"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.1.06/raspbian_release/mx2cc"
 	
 	ted2="../bin/ted2_raspbian"
 	ted2_new="../src/ted2/ted2.buildv1.1.06/raspbian_release"
@@ -30,8 +30,8 @@ then
 	launcher="../Monkey2 (Raspbian)"
 	launcher_new="../src/launcher/launcher.buildv1.1.06/raspbian_release/launcher"
 else
+	host="macos"
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.1.07/macos_release/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
 	ted2_new="../src/ted2/ted2.buildv1.1.07/macos_release/ted2.app"

scripts/rebuildmx2cc.bat

@@ -9,6 +9,6 @@ echo.
 
 %mx2cc% makemods -clean -config=release monkey libc miniz stb-image stb-image-write stb-vorbis std
 
-%mx2cc% makeapp -clean -config=release -apptype=console ../src/mx2cc/mx2cc.monkey2
+%mx2cc% makeapp -clean -apptype=console -config=release -product=scripts/mx2cc.products/mx2cc_windows.exe ../src/mx2cc/mx2cc.monkey2
 
-copy %mx2cc_new% %mx2cc%
+copy mx2cc.products\mx2cc_windows.exe %mx2cc%

scripts/rebuildmx2cc.sh

@@ -7,6 +7,6 @@ echo ""
 
 $mx2cc makemods -clean -config=release monkey libc miniz stb-image stb-image-write stb-vorbis std
 
-$mx2cc makeapp -clean -config=release -apptype=console ../src/mx2cc/mx2cc.monkey2
+$mx2cc makeapp -clean -apptype=console -config=release -product=scripts/mx2cc.products/mx2cc_$host ../src/mx2cc/mx2cc.monkey2
 
-cp "$mx2cc_new" "$mx2cc"
+copy mx2cc.products/mx2cc_$host $mx2cc

scripts/rebuildted2.bat

@@ -7,10 +7,10 @@ echo.
 echo ***** Rebuilding ted2 *****
 echo.
 
-%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy %ted2_new%\assets %ted2%\assets /Q /I /S /Y
-xcopy %ted2_new%\*.dll %ted2% /Q /I /S /Y
-xcopy %ted2_new%\*.exe %ted2% /Q /I /S /Y
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -product=scripts/ted2.products/windows/ted2.exe ../src/ted2/ted2.monkey2
+xcopy ted2.products\windows\assets ..\bin\ted2_windows\assets /Q /I /S /Y
+xcopy ted2.products\windows\*.dll ..\bin\ted2_windows /Q /I /S /Y
+xcopy ted2.products\windows\*.exe ..\bin\ted2_windows /Q /I /S /Y
 
-%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy %launcher_new% %launcher%
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -product=scripts/launcher.products/launcher_windows.exe ../src/launcher/launcher.monkey2
+copy launcher.products\launcher_windows.exe "..\Monkey2 (Windows).exe"

scripts/rebuildted2go.bat

@@ -7,10 +7,10 @@ echo.
 echo ***** Rebuilding ted2 *****
 echo.
 
-%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
-xcopy %ted2go_new%\assets %ted2%\assets /Q /I /S /Y
-xcopy %ted2go_new%\*.dll %ted2% /Q /I /S /Y
-xcopy %ted2go_new%\*.exe %ted2% /Q /I /S /Y
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -product=scripts/ted2go.products/windows/Ted2.exe ../src/ted2go/Ted2.monkey2
+xcopy ted2go.products\windows\assets ..\bin\ted2_windows\assets /Q /I /S /Y
+xcopy ted2go.products\windows\*.dll ..\bin\ted2_windows /Q /I /S /Y
+xcopy ted2go.products\windows\*.exe ..\bin\ted2_windows /Q /I /S /Y
 
-%mx2cc% makeapp -clean -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy %launcher_new% %launcher%
+%mx2cc% makeapp -clean -apptype=gui -build -config=release -product=scripts/launcher.products/launcher_windows.exe ../src/launcher/launcher.monkey2
+copy launcher.products\launcher_windows.exe "..\Monkey2 (Windows).exe"

scripts/updatemx2cc.bat

@@ -9,6 +9,6 @@ echo.
 
 %mx2cc% makemods -config=release monkey libc miniz stb-image stb-image-write stb-vorbis std
 
-%mx2cc% makeapp -apptype=console -config=release ../src/mx2cc/mx2cc.monkey2
+%mx2cc% makeapp -apptype=console -config=release -product=scripts/mx2cc.products/mx2cc_windows.exe ../src/mx2cc/mx2cc.monkey2
 
-copy %mx2cc_new% %mx2cc%
+copy mx2cc.products\mx2cc_windows.exe %mx2cc%

scripts/updatemx2cc.sh

@@ -7,6 +7,6 @@ echo ""
 
 $mx2cc makemods -config=release monkey libc miniz stb-image stb-image-write stb-vorbis std
 
-$mx2cc makeapp -apptype=console -config=release ../src/mx2cc/mx2cc.monkey2
+$mx2cc makeapp -apptype=console -config=release -product=src/mx2cc/mx2cc.products/mx2cc_$host ../src/mx2cc/mx2cc.monkey2
 
-cp "$mx2cc_new" "$mx2cc"
+cp ..\src\mx2cc\mx2cc.products\mx2cc_$host %mx2cc%

scripts/updateted2.bat

@@ -7,10 +7,10 @@ echo.
 echo ***** Updating ted2 *****
 echo.
 
-%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2/ted2.monkey2
-xcopy %ted2_new%\assets %ted2%\assets /Q /I /S /Y
-xcopy %ted2_new%\*.dll %ted2% /Q /I /S /Y
-xcopy %ted2_new%\*.exe %ted2% /Q /I /S /Y
+%mx2cc% makeapp -apptype=gui -build -config=release -product=scripts/ted2.products/windows/ted2.exe ../src/ted2/ted2.monkey2
+xcopy ted2.products\windows\assets ..\bin\ted2_windows\assets /Q /I /S /Y
+xcopy ted2.products\windows\*.dll ..\bin\ted2_windows /Q /I /S /Y
+xcopy ted2.products\windows\*.exe ..\bin\ted2_windows /Q /I /S /Y
 
-%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy %launcher_new% %launcher%
+%mx2cc% makeapp -apptype=gui -build -config=release -product=scripts/launcher.products/launcher_windows.exe ../src/launcher/launcher.monkey2
+copy launcher.products\launcher_windows.exe "..\Monkey2 (Windows).exe"

scripts/updateted2go.bat

@@ -1,16 +1,16 @@
-
-echo off
-
-call common.bat
-
-echo.
-echo ***** Updating ted2 *****
-echo.
-
-%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
-xcopy %ted2go_new%\assets %ted2%\assets /Q /I /S /Y
-xcopy %ted2go_new%\*.dll %ted2% /Q /I /S /Y
-xcopy %ted2go_new%\*.exe %ted2% /Q /I /S /Y
-
-%mx2cc% makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
-copy %launcher_new% %launcher%
+
+echo off
+
+call common.bat
+
+echo.
+echo ***** Updating ted2 *****
+echo.
+
+%mx2cc% makeapp -apptype=gui -build -config=release -product=scripts/ted2go.products/windows/Ted2.exe ../src/ted2go/Ted2.monkey2
+xcopy ted2go.products\windows\assets ..\bin\ted2_windows\assets /Q /I /S /Y
+xcopy ted2go.products\windows\*.dll ..\bin\ted2_windows /Q /I /S /Y
+xcopy ted2go.products\windows\*.exe ..\bin\ted2_windows /Q /I /S /Y
+
+%mx2cc% makeapp -apptype=gui -build -config=release -product=scripts/launcher.products/launcher_windows.exe ../src/launcher/launcher.monkey2
+copy launcher.products\launcher_windows.exe "..\Monkey2 (Windows).exe"