Index: meson.build ================================================================== --- meson.build +++ meson.build @@ -1,7 +1,7 @@ project('Cube', ['c', 'objcpp'], - meson_version: '1.5.0') + meson_version: '>=1.5.0') add_global_arguments( [ '-fobjc-arc', '-fobjc-arc-exceptions' @@ -10,14 +10,22 @@ objfw_dep = dependency('objfw') sdl12_dep = dependency('sdl12_compat') sdlimage_dep = dependency('SDL_image') sdlmixer_dep = dependency('SDL_mixer') -gl_dep = dependency('gl') -glu_dep = dependency('glu') zlib_dep = dependency('zlib') -x11_dep = dependency('x11', required: false) + +link_args = [] +extra_deps = [] + +if host_machine.system() == 'windows' + link_args += ['-lopengl32', '-lglu32'] +else + extra_deps += dependency('gl') + extra_deps += dependency('glu') + extra_deps += dependency('x11') +endif enet_includes = include_directories('enet/include') enet = static_library('enet', [ 'enet/callbacks.c', @@ -71,17 +79,17 @@ dependencies: [ objfw_dep, sdl12_dep, sdlimage_dep, sdlmixer_dep, - gl_dep, - glu_dep, zlib_dep, - x11_dep, + extra_deps ], include_directories: [enet_includes], - link_with: [enet]) + link_args: link_args, + link_with: [enet], + win_subsystem: 'windows') executable('server', [ 'src/server.mm', 'src/serverms.mm', @@ -92,6 +100,7 @@ dependencies: [ objfw_dep, sdl12_dep ], include_directories: [enet_includes], - link_with: [enet]) + link_with: [enet], + win_subsystem: 'console')