diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39c8aadd..222b081e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Build dedicated windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug -d
+        ./waf.bat configure -T debug -dl
         ./waf.bat build
 
   build-dedicated-windows-amd64:
@@ -71,7 +71,7 @@ jobs:
     - name: Build dedicated windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug -d -8
+        ./waf.bat configure -T debug -dl -8
         ./waf.bat build
 
   build-dedicated-linux-i386:
@@ -81,7 +81,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build dedicated linux-i386
       run: |
-        scripts/build-ubuntu-i386.sh -d
+        scripts/build-ubuntu-i386.sh -dl
 
   build-dedicated-linux-amd64:
     runs-on: ubuntu-20.04
@@ -90,7 +90,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build dedicated linux-amd64
       run: |
-        scripts/build-ubuntu-amd64.sh -d
+        scripts/build-ubuntu-amd64.sh -dl
 
   build-macos-amd64:
     runs-on: macos-latest
@@ -108,4 +108,4 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build dedicated macos-amd64
       run: |
-        scripts/build-macos-amd64.sh -d
+        scripts/build-macos-amd64.sh -dl
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d8adc5ab..9578d1cc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Run tests windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/
+        ./waf.bat configure -T release -lt --prefix=out/
         ./waf.bat install
         cd out
         $env:Path = "bin";
@@ -52,7 +52,7 @@ jobs:
     - name: Run tests windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/ -8
+        ./waf.bat configure -T release -lt --prefix=out/ -8
         ./waf.bat install
         cd out
         $env:Path = "bin";
diff --git a/scripts/build-android-armv7a.sh b/scripts/build-android-armv7a.sh
index 4c7201ff..f3e16947 100755
--- a/scripts/build-android-armv7a.sh
+++ b/scripts/build-android-armv7a.sh
@@ -5,5 +5,5 @@ wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip
 unzip android-ndk-r10e-linux-x86_64.zip
 export ANDROID_NDK_HOME=$PWD/android-ndk-r10e/
 export NDK_HOME=$PWD/android-ndk-r10e/
-./waf configure -T debug --android=armeabi-v7a-hard,4.9,21 --togles --disable-warns &&
+./waf configure -T debug --android=armeabi-v7a-hard,4.9,21 --use-togles --no-warns &&
 ./waf build
diff --git a/scripts/build-macos-amd64.sh b/scripts/build-macos-amd64.sh
index de0e8cfd..919c66df 100755
--- a/scripts/build-macos-amd64.sh
+++ b/scripts/build-macos-amd64.sh
@@ -4,5 +4,5 @@ git submodule init && git submodule update
 
 brew install sdl2
 
-./waf configure -T debug --64bits --disable-warns $* &&
+./waf configure -T debug --64bits --no-warns $* &&
 ./waf build
diff --git a/scripts/build-ubuntu-amd64.sh b/scripts/build-ubuntu-amd64.sh
index e598240d..ac06c47a 100755
--- a/scripts/build-ubuntu-amd64.sh
+++ b/scripts/build-ubuntu-amd64.sh
@@ -4,5 +4,5 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev
 
-./waf configure -T debug --64bits --disable-warns $* &&
+./waf configure -T debug --64bits --no-warns $* &&
 ./waf build
diff --git a/scripts/build-ubuntu-i386.sh b/scripts/build-ubuntu-i386.sh
index c9609cae..10115469 100755
--- a/scripts/build-ubuntu-i386.sh
+++ b/scripts/build-ubuntu-i386.sh
@@ -6,5 +6,5 @@ sudo apt-get update
 sudo apt-get install -y aptitude
 sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --no-warns $* &&
 ./waf build
diff --git a/scripts/tests-macos-amd64.sh b/scripts/tests-macos-amd64.sh
index ff4e46b2..ee1d0cfa 100755
--- a/scripts/tests-macos-amd64.sh
+++ b/scripts/tests-macos-amd64.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 git submodule init && git submodule update
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests -8 --prefix=out/ $* &&
+./waf configure -T release --sanitize=address,undefined --no-warns -lt -8 --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1
diff --git a/scripts/tests-ubuntu-amd64.sh b/scripts/tests-ubuntu-amd64.sh
index 1cef058e..6b1aad9e 100755
--- a/scripts/tests-ubuntu-amd64.sh
+++ b/scripts/tests-ubuntu-amd64.sh
@@ -4,7 +4,7 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -y libbz2-dev
 
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ --64bits $* &&
+./waf configure -T release --sanitize=address,undefined --no-warns -lt --prefix=out/ --64bits $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest
diff --git a/scripts/tests-ubuntu-i386.sh b/scripts/tests-ubuntu-i386.sh
index f14fc361..178ed67d 100755
--- a/scripts/tests-ubuntu-i386.sh
+++ b/scripts/tests-ubuntu-i386.sh
@@ -5,7 +5,7 @@ sudo dpkg --add-architecture i386
 sudo apt-get update
 sudo apt-get install -y g++-multilib gcc-multilib libbz2-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --sanitize=address,undefined --no-warns -lt --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest
diff --git a/wscript b/wscript
index 2e7da207..2ec9ec50 100644
--- a/wscript
+++ b/wscript
@@ -181,18 +181,19 @@ def define_platform(conf):
 
 	if conf.options.LAUNCHER:
 		conf.env.projects += ['main']
-		if conf.options.GL:
-			conf.env.GL = True
-			conf.env.targets += ['togl']
+		conf.env.GL = conf.options.GL or conf.options.TOGLES
+		if conf.options.TOGLES:
+			conf.env.TOGLES = True
+			conf.env.targets += ['togles']
+			conf.env.append_unique('DEFINES', ['TOGLES'])
+		if conf.env.GL:
+			if not conf.env.TOGLES:
+				conf.env.targets += ['togl']
 			conf.env.append_unique('DEFINES', [
 				'DX_TO_GL_ABSTRACTION',
 				'GL_GLEXT_PROTOTYPES',
 				'BINK_VIDEO'
 			])
-		elif conf.options.TOGLES:
-			conf.env.TOGLES = True
-			conf.env.targets += ['togles']
-			conf.env.append_unique('DEFINES', ['TOGLES'])
 
 		if conf.options.SDL:
 			conf.env.SDL = True
@@ -283,7 +284,7 @@ def options(opt):
 	if sys.platform == 'win32':
 		grp.add_option('--use-sdl', action = 'store_true', dest = 'SDL', default = False,
 			help = 'build engine with SDL [default: %default]')
-		grp.add_option('--use-togl', action = 'store_true', dest = 'SDL', default = False,
+		grp.add_option('--use-togl', action = 'store_true', dest = 'GL', default = False,
 			help = 'build engine with ToGL [default: %default]')
 	else:
 		grp.add_option('--no-sdl', action = 'store_false', dest = 'SDL', default = True,
@@ -610,6 +611,8 @@ def configure(conf):
 
 	for proj in conf.env.projects:
 		conf.add_subproject(projects[proj])
+	for targ in conf.env.targets:
+		conf.add_subproject(targ)
 
 def build(bld):
 	os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)