Raw input + drag and drop on Windows, cleanup

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 7 insertions, 8 deletions

diff --git a/meson.build b/meson.build
index af738aa..3215fc2 100644
--- a/meson.build
+++ b/meson.build
@@ -4,16 +4,17 @@ project('stela', 'c', version: '0.01',
   license: 'GPL-3.0-only')
 
 compiler = meson.get_compiler('c')
-cmake = import('cmake')
 
 is_debug = get_option('debug')
 is_minsize = get_option('optimization') == 's'
-
 is_linux = host_machine.system() == 'linux'
 is_windows = host_machine.system() == 'windows'
 is_macos = host_machine.system() == 'darwin'
 is_android = host_machine.system() == 'android'
 
+cmake = import('cmake')
+cmake_reltype = is_minsize ? 'MinSizeRel' : 'Release'
+
 if get_option('window') == 'null'
   error('No window type selected.')
 endif
@@ -201,8 +202,7 @@ elif get_option('window') == 'glfw'
   glfw3 = dependency('glfw3', required: false, allow_fallback: false)
   if not glfw3.found()
     glfw_opts = cmake.subproject_options()
-    reltype = is_minsize ? 'MinSizeRel' : 'Release'
-    glfw_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : reltype })
+    glfw_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : cmake_reltype })
     glfw_opts.add_cmake_defines({ 'GLFW_INSTALL': false })
     glfw_opts.add_cmake_defines({ 'GLFW_BUILD_EXAMPLES': false })
     glfw_opts.add_cmake_defines({ 'GLFW_BUILD_TESTS': false })
@@ -220,14 +220,13 @@ elif get_option('window') == 'glfm'
   glfm = dependency('glfm', required: false, allow_fallback: false)
   if not glfm.found()
     glfm_opts = cmake.subproject_options()
-    reltype = is_minsize ? 'MinSizeRel' : 'Release'
-    glfm_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : reltype })
+    glfm_opts.add_cmake_defines({ 'CMAKE_BUILD_TYPE': is_debug ? 'Debug' : cmake_reltype })
     glfm_opts.add_cmake_defines({ 'CMAKE_POSITION_INDEPENDENT_CODE': true })
     glfm = cmake.subproject('glfm', options: glfm_opts).dependency('glfm')
   endif
   stela_src += ['src/window_glfm.c']
   stela_deps += [glfm]
-  stela_args += ['-DSTELA_WINDOW_GLFM']
+  stela_args += ['-DSTELA_WINDOW_GLFM', '-DSTELA_USE_PLATFORM_MAIN']
 endif
 
 stela = declare_dependency(include_directories: stela_inc,
@@ -238,6 +237,6 @@ if not meson.is_subproject()
   stela_lib = shared_library('stela', dependencies: stela, install: false)
 endif
 
-if get_option('tests').allowed() and not meson.is_subproject()
+if get_option('tests').allowed()
   subdir('tests')
 endif