From 42d712a26b53ad14c073154b9f5736b97baa7d29 Mon Sep 17 00:00:00 2001
From: DaniTheSkunk <>
Date: Tue, 7 Mar 2023 19:42:50 +0000
Subject: [PATCH] build cleanup

---
 build.bat      |  7 +---
 em.ini         |  9 -----
 meson.build    | 91 --------------------------------------------------
 native.ini     |  3 --
 prebuild.bat   |  3 --
 prebuildem.bat |  2 --
 6 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 em.ini
 delete mode 100644 meson.build
 delete mode 100644 native.ini
 delete mode 100644 prebuild.bat
 delete mode 100644 prebuildem.bat

diff --git a/build.bat b/build.bat
index 3156928..1f21179 100644
--- a/build.bat
+++ b/build.bat
@@ -1,10 +1,5 @@
 @ECHO OFF
 
-REM cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -GNinja .. && ninja && copy compile_commands.json .. && skunkworks.exe
-
-REM cd build && meson compile && copy compile_commands.json .. && cd .. && build\gsa.exe
-clang build.c src/str.c src/types.c -Iinclude -Wno-everything -obuild.exe && build.exe && del build.exe && build\gsa_simple.exe
+cl build.c src/str.c src/types.c /Iinclude && del *.obj && build.exe && del build.exe && build\gsa_simple.exe
 EXIT /B %ERRORLEVEL%
-REM build\skip.exe c src && exit /b 1
-REM build\gsa.exe
 
diff --git a/em.ini b/em.ini
deleted file mode 100644
index 12157f5..0000000
--- a/em.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[binaries]
-c = ['c:/dev/_tools/emsdk/upstream/emscripten/emcc.bat']
-ar =['c:/dev/_tools/emsdk/upstream/emscripten/emar.bat']
-
-[host_machine]
-system = 'emscripten'
-cpu_family = 'wasm'
-cpu = 'wasm'
-endian = 'little'
\ No newline at end of file
diff --git a/meson.build b/meson.build
deleted file mode 100644
index cbdcd0e..0000000
--- a/meson.build
+++ /dev/null
@@ -1,91 +0,0 @@
-project('skunkworks', 'c',
-	default_options: [
-		'buildtype=release',
-		'strip=true',
-		'debug=false'
-	]
-)
-
-cmake = import('cmake')
-
-opt = cmake.subproject_options()
-#opt.add_cmake_defines({'MSVC': true})
-libz = cmake.subproject('zlib-1.2.13', options: opt).dependency('zlibstatic')
-
-opt = cmake.subproject_options()
-opt.add_cmake_defines({
-	'ZLIB_INCLUDE_DIRS': 'subprojects/zlib-1.2.13',
-	'PNG_BUILD_ZLIB': true,
-	'PNG_SHARED': false,
-	'PNG_STATIC': true,
-	'PNG_EXECUTABLES': false,
-	'PNG_TESTS': false,
-	'BUILD_SHARED_LIBS': false,
-	'SKIP_INSTALL_ALL': true
-})
-opt.append_compile_args('c', '-I../subprojects/zlib-1.2.13', '-Isubprojects/zlib-1.2.13/__CMake_build')
-libpng = cmake.subproject('lpng1639', options: opt).dependency('png_static')
-
-opt = cmake.subproject_options()
-opt.add_cmake_defines({'GLFW_BUILD_DOCS': false})
-
-
-if host_machine.system() == 'emscripten'
-   #libglfw = meson.get_compiler('c').find_library('glfw')
-   deps = [libz, libpng]
-else
-	libglfw = cmake.subproject('glfw-3.3.8', options: opt).dependency('glfw')
-	libglew = subproject('glew-2.1.0').get_variable('libglew_dep')
-	deps = [libz, libpng, libglew, libglfw]
-endif
-
-skunk_sources = [
-	'src/color32.c',
-	'src/error.c',
-	'src/file.c',
-	'src/framebuffer.c',
-	'src/gamepad.c',
-	'src/gsa.c',
-	'src/gsa_input.c',
-	'src/gsa_map.c',
-	'src/gsa_text.c',
-	'src/image32.c',
-	'src/image8.c',
-	'src/scaler.c',
-	'src/shader.c',
-	'src/shaders.c',
-	'src/skip.c',
-	'src/skunkworks.c',
-	'src/str.c',
-	'src/types.c',
-	'src/vec2i.c',
-	'src/window.c'
-]
-
-xxd = find_program('xxd')
-cmd = find_program('cmd')
-embed_gfx = custom_target('embed-gfx', input: ['gfx.png'], output: ['embed_gfx.h'],
-		  command: [xxd, '-i', '@INPUT@', '@OUTPUT@'])
-
-add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language : 'c')
-add_project_arguments('-Wall', language : 'c')
-add_project_arguments('-Wextra', language : 'c')
-add_project_arguments('-Werror', language : 'c')
-
-lib = static_library('skunkworks', skunk_sources, include_directories: 'include', dependencies: deps)
-
-if host_machine.system() == 'emscripten'
-   executable('skunktest', link_with: lib, include_directories: 'include', dependencies: deps, link_args: ['-lglfw', '-lGL', '-s', 'USE_GLFW=3'], name_suffix: 'html')
-	executable('gsa', 'examples/gsa_simple.c', embed_gfx, link_with: lib, include_directories: 'include', dependencies: deps, link_args: ['-lglfw', '-lGL', '-s', 'USE_GLFW=3', '-s', 'ALLOW_MEMORY_GROWTH', '-s', 'FULL_ES3'], name_suffix: 'html')
-else
-	skip = executable('skip', 'tools/skip.c', link_with: lib, include_directories: 'include', dependencies: deps)
-	executable('skunktest', 'src/test.c', link_with: lib, include_directories: 'include', dependencies: deps)
-	gsa = executable('gsa', 'examples/gsa_simple.c', embed_gfx, link_with: lib, include_directories: 'include', dependencies: deps)
-#	custom_target(
-#		'gsa skip',
-#		input: gsa,
-#		output: 'fake',
-#		command: ['skip.exe', 'ca1', '..\src', gsa],
-#		build_by_default: true
-#	)
-endif
diff --git a/native.ini b/native.ini
deleted file mode 100644
index 47431be..0000000
--- a/native.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[binaries]
-c = 'clang'
-c_ld = 'lld'
diff --git a/prebuild.bat b/prebuild.bat
deleted file mode 100644
index cfa81c2..0000000
--- a/prebuild.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-meson setup --native-file native.ini build
diff --git a/prebuildem.bat b/prebuildem.bat
deleted file mode 100644
index 05df587..0000000
--- a/prebuildem.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-meson setup --cross-file=em.ini --prefer-static buildem