4 files changed, 8 insertions, 5 deletions
diff --git a/changes.txt b/changes.txt
index 5efb44a..017a91d 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,7 @@
-
+1.3
+- windows shows *after* loading pixelformat & opengl setup
+- replace png with bmps
+- setting to swap between gpu & cpu rendering
 1.2
 - show version on settings page
 1.1
diff --git a/release-linux.sh b/release-linux.sh
index 7eba327..97ff655 100644
--- a/release-linux.sh
+++ b/release-linux.sh
@@ -8,7 +8,7 @@ mkdir bin
 
 cd src
 
-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
+ld -r -b binary -o ../bin/data.o ../data/imgs/en.bmp  ../data/imgs/nl.bmp ../data/imgs/logo_64.bmp ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.bmp ../data/imgs/delete.bmp ../data/imgs/add.bmp ../data/imgs/set.bmp
 
 gcc -Wall -O3 -m64 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl
 
diff --git a/release-windows.bat b/release-windows.bat
index 67bb79f..59672a6 100644
--- a/release-windows.bat
+++ b/release-windows.bat
@@ -5,7 +5,7 @@ DEL /S /Q "release/windows"
 
 cd src 
 
-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
+ld -r -b binary -o ../bin/data.o ../data/imgs/en.bmp  ../data/imgs/nl.bmp ../data/imgs/logo_64.bmp ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.bmp ../data/imgs/delete.bmp ../data/imgs/add.bmp ../data/imgs/set.bmp
 
 x86_64-w64-mingw32-gcc -Wall -m64 -O3 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi -mwindows
 
diff --git a/src/mo_edit.c b/src/mo_edit.c
index 78f57a6..a3d62bd 100644
--- a/src/mo_edit.c
+++ b/src/mo_edit.c
@@ -475,7 +475,7 @@ int main(int argc, char **argv)
 		window_w = 800;
 		window_h = 600;
 	}
-	global_use_gpu = settings_config_get_number(&config, "USE_GPU");
+	global_use_gpu = settings_config_get_number(&config, "USE_GPU") == 2 ? 1 : 0;
 	
 	platform_window window = platform_open_window("mo-edit", window_w, window_h, 0, 0, 800, 600);
 	main_window = &window;
@@ -1003,7 +1003,7 @@ int main(int argc, char **argv)
 	vec2 win_size = platform_get_window_size(&window);
 	settings_config_set_number(&config, "WINDOW_WIDTH", win_size.x);
 	settings_config_set_number(&config, "WINDOW_HEIGHT", win_size.y);
-	settings_config_set_number(&config, "USE_GPU", global_settings_page.use_gpu);
+	settings_config_set_number(&config, "USE_GPU", global_use_gpu+1);
 	
 	{
 		char *recent_project_list_buffer = mem_alloc(recent_projects_list.length*MAX_INPUT_LENGTH);