Removed wasm target - now an appType for emscripten target.

src/mx2cc/builder.monkey2

@@ -31,8 +31,6 @@ Class BuildOpts
 	
 	Field reflection:Bool
 	
-	Field wasm:Bool
-	
 End
 
 Class BuilderInstance
@@ -89,10 +87,10 @@ Class BuilderInstance
 		
 			SetEnv( "PATH",GetEnv( "MX2_RASPBIAN_TOOLS" )+";"+GetEnv( "PATH" ) )
 			
-		Else If opts.target="wasm"
+'		Else If opts.target="wasm"
 		
-			opts.target="emscripten"
-			opts.wasm=True
+'			opts.target="emscripten"
+'			opts.wasm=True
 			
 		Endif
 		

src/mx2cc/buildproduct.monkey2

@@ -557,7 +557,7 @@ Class GccBuildProduct Extends BuildProduct
 			
 			cmd+=" --preload-file ~q"+assetsDir+"@/assets~q"
 			
-			If opts.wasm cmd+=" -s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'"
+			If opts.appType.StartsWith( "wasm" ) cmd+=" -s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'"
 		End
 		
 		If opts.verbose>=0 Print "Linking "+outputFile+"..."
@@ -595,6 +595,12 @@ Class GccBuildProduct Extends BuildProduct
 		CopyDlls( dllsDir )
 		
 		Exec( cmd )
+		
+		If opts.target="emscripten"
+			If opts.appType="wasm"
+				DeleteFile( StripExt( outputFile )+".asm.js" )
+			Endif
+		Endif
 
 	End
 	

src/mx2cc/mx2cc.monkey2

@@ -23,7 +23,7 @@ Global StartDir:String
 
 'Const TestArgs:="mx2cc makemods"
 
-Const TestArgs:="mx2cc makeapp -target=desktop -apptype=console -run src/mx2cc/test.monkey2"
+Const TestArgs:="mx2cc makeapp -target=emscripten -apptype=wasm+asmjs src/mx2cc/test.monkey2"
 
 'Const TestArgs:="mx2cc makedocs mojo3d"
 
@@ -381,18 +381,13 @@ Function ParseOpts:String[]( opts:BuildOpts,args:String[] )
 		Case "-product"
 			opts.product=path
 		Case "-apptype"
-			Select val
-			Case "gui","console"
-				opts.appType=val
-			Default
-				Fail( "Invalid value for 'apptype' option: '"+val+"' - must be 'gui' or 'console'" )
-			End
+			opts.appType=val
 		Case "-target"
 			Select val
-			Case "desktop","windows","macos","linux","raspbian","emscripten","wasm","android","ios"
+			Case "desktop","windows","macos","linux","raspbian","emscripten","android","ios"
 				opts.target=val
 			Default
-				Fail( "Invalid value for 'target' option: '"+val+"' - must be 'desktop', 'raspbian', 'emscripten', 'wasm', 'android' or 'ios'" )
+				Fail( "Invalid value for 'target' option: '"+val+"' - must be 'desktop', 'raspbian', 'emscripten', 'android' or 'ios'" )
 			End
 		Case "-config"
 			Select val
@@ -414,6 +409,19 @@ Function ParseOpts:String[]( opts:BuildOpts,args:String[] )
 	
 	Next
 	
+	Select opts.appType
+	Case "console","gui"
+		Select opts.target
+		Case "desktop","windows","macos","linux","raspbian"
+		Default
+			Fail( "apptype '"+opts.appType+"' may ponly be used with desktop targets" )
+		End
+	case "wasm","asmjs","wasm+asmjs"
+		If opts.target<>"emscripten" Fail( "apptype '"+opts.appType+"' is only valid for emscripten target" )
+	Default
+		Fail( "Unrecognized apptype '"+opts.appType+"'" )
+	End
+		
 	Return Null
 End
 

src/mx2cc/test.monkey2

@@ -1,8 +1,6 @@
 
 Function Main()
 	
-	Local t:=-.1
-	
-	Print t
+	Print "Hello World!"
 
 End

src/mx2cc/var.monkey2

@@ -73,12 +73,6 @@ Class VarValue Extends Value
 	
 	Method OnSemant:SNode() Override
 		
-		Select vdecl.ident
-		Case "B","D"
-			Print "Semanting "+vdecl.ident
-			Print "scope="+Cast<ClassScope>( scope ).ctype.ToString()
-		End
-	
 		Scope.semanting.Push( scope )
 		
 		If vdecl.type

src/ted2/buildactions.monkey2

@@ -109,9 +109,6 @@ Class BuildActions
 		_emscriptenTarget=New CheckButton( "Emscripten",,group )
 		_emscriptenTarget.Layout="fill-x"
 		
-		_wasmTarget=New CheckButton( "Wasm",,group )
-		_wasmTarget.Layout="fill-x"
-		
 		_androidTarget=New CheckButton( "Android",,group )
 		_androidTarget.Layout="fill-x"
 		
@@ -124,7 +121,6 @@ Class BuildActions
 		targetMenu.AddSeparator()
 		targetMenu.AddView( _desktopTarget )
 		targetMenu.AddView( _emscriptenTarget )
-		targetMenu.AddView( _wasmTarget )
 		targetMenu.AddView( _androidTarget )
 		targetMenu.AddView( _iosTarget )
 		targetMenu.AddSeparator()
@@ -152,14 +148,6 @@ Class BuildActions
 			_emscriptenTarget.Enabled=False
 		Endif
 
-		If _validTargets.Contains( "wasm" )
-			_wasmTarget.Clicked+=Lambda()
-				_buildTarget="wasm"
-			End
-		Else
-			_wasmTarget.Enabled=False
-		Endif
-
 		If _validTargets.Contains( "android" )
 			_androidTarget.Clicked+=Lambda()
 				_buildTarget="android"
@@ -218,8 +206,6 @@ Class BuildActions
 					_desktopTarget.Checked=True
 				Case "emscripten"
 					_emscriptenTarget.Checked=True
-				Case "wasm"
-					_wasmTarget.Checked=True
 				Case "android"
 					_androidTarget.Checked=True
 				Case "ios"
@@ -267,7 +253,6 @@ Class BuildActions
 	Field _releaseConfig:CheckButton
 	Field _desktopTarget:CheckButton
 	Field _emscriptenTarget:CheckButton
-	Field _wasmTarget:CheckButton
 	Field _androidTarget:CheckButton
 	Field _iosTarget:CheckButton
 	
@@ -475,7 +460,7 @@ Class BuildActions
 
 			_debugView.DebugApp( exeFile,config )
 
-		Case "emscripten","wasm"
+		Case "emscripten"
 		
 			Local mserver:=GetEnv( "MX2_MSERVER" )
 			If mserver _console.Run( mserver+" ~q"+exeFile+"~q" )

src/ted2/buildproduct.monkey2

@@ -38,8 +38,6 @@ Class BuildProduct
 #endif
 		Case "emscripten"
 			product=New EmscriptenProduct( srcPath )
-		Case "wasm"
-			product=New WasmProduct( srcPath )
 		Case "android"
 			product=New AndroidProduct( srcPath )
 		Case "ios"
@@ -434,6 +432,8 @@ Class EmscriptenProduct Extends BuildProduct
 		Super.New( srcPath,"emscripten" )
 
 		AddExts( New String[]( ".html" ) )
+		
+		AddVar( "Application Type","asmjs","options:asmjs|wasm|wasm+asmjs" )
 	End
 	
 	Protected
@@ -454,10 +454,13 @@ Class EmscriptenProduct Extends BuildProduct
 	
 	Method OnGetMx2ccOpts:String() Override
 
+		Local appType:=GetVar( "APPLICATION_TYPE" )
+
 		Local opts:=""
 		
 		opts+=" ~q-product="+ProductDir+AppName+".js~q"
-		
+		opts+=" -apptype="+appType
+
 		Return opts
 	End
 
@@ -468,6 +471,7 @@ Class EmscriptenProduct Extends BuildProduct
 	End
 End
 
+#rem
 Class WasmProduct Extends BuildProduct
 
 	Method New( srcPath:String )
@@ -507,6 +511,7 @@ Class WasmProduct Extends BuildProduct
 	
 	End
 End
+#end
 
 Class AndroidProduct Extends BuildProduct
 

src/ted2/mainwindow.monkey2

@@ -14,6 +14,11 @@ Class MainWindowInstance Extends Window
 		
 		MainWindow=Self
 		
+		If Not App.Theme.Load( jobj.GetString( "theme" ) )
+			jobj.SetString( "theme","ted2-default" )
+			App.Theme.Load( "ted2-default" )
+		Endif
+		
 		_tmp=RealPath( "tmp/" )
 		
 #If __TARGET__="macos"
@@ -630,7 +635,11 @@ Class MainWindowInstance Extends Window
 			Local value:=it.Value.ToString()
 			menu.AddAction( name ).Triggered=Lambda()
 				_theme=value
-				App.Theme.Load( _theme,New Vec2f( _themeScale ) )
+				If Not App.Theme.Load( _theme,New Vec2f( _themeScale ) )
+					If Not App.Theme.Load( "ted2-default" )
+					Endif
+					_theme="ted2-default"
+				Endif
 				SaveState()
 			End
 		Next

src/ted2/mx2ccenv.monkey2

@@ -90,7 +90,6 @@ Function EnumValidTargets:StringStack( console:Console )
 	
 	targets.Push( "desktop" )
 	targets.Push( "emscripten" )
-	targets.Push( "wasm" )
 	targets.Push( "android" )
 #If __TARGET__="macos"
 	targets.Push( "ios" )

src/ted2/ted2.monkey2

@@ -81,8 +81,8 @@ Function Main()
 	
 	Local config:=New StringMap<String>
 	
-	config["initialTheme"]=jobj.GetString( "theme" )
-	config["initialThemeScale"]=jobj.GetNumber( "themeScale" )
+	'config["initialTheme"]=jobj.GetString( "theme" )
+	'config["initialThemeScale"]=jobj.GetNumber( "themeScale" )
 	
 	'initial window state
 	'