Overview
Comment: | meson.build: Improve Windows compatibility
Meson still needs a patch to pick the correct compiler on Windows and enet still does not link on Windows. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
51594e74fba5032135c87146cf3363c2 |
User & Date: | js on 2024-08-04 11:35:00 |
Other Links: | manifest | tags |
Context
2024-08-04
| ||
22:26 | Fix building on Windows check-in: f00c286569 user: js tags: trunk | |
11:35 | meson.build: Improve Windows compatibility check-in: 51594e74fb user: js tags: trunk | |
2024-08-03
| ||
15:12 | Start migrating commands / variables to ObjC++ check-in: f4c57c1df0 user: js tags: trunk | |
Changes
Modified meson.build from [e523f05d4d] to [a2608a5a36].
1 | project('Cube', ['c', 'objcpp'], | | | > > > > > > > | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | project('Cube', ['c', 'objcpp'], meson_version: '>=1.5.0') add_global_arguments( [ '-fobjc-arc', '-fobjc-arc-exceptions' ], language: 'objcpp') objfw_dep = dependency('objfw') sdl12_dep = dependency('sdl12_compat') sdlimage_dep = dependency('SDL_image') sdlmixer_dep = dependency('SDL_mixer') zlib_dep = dependency('zlib') 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', 'enet/host.c', 'enet/list.c', |
︙ | ︙ | |||
69 70 71 72 73 74 75 | 'src/worldrender.mm', ], dependencies: [ objfw_dep, sdl12_dep, sdlimage_dep, sdlmixer_dep, | < < | > | > | > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | 'src/worldrender.mm', ], dependencies: [ objfw_dep, sdl12_dep, sdlimage_dep, sdlmixer_dep, zlib_dep, extra_deps ], include_directories: [enet_includes], link_args: link_args, link_with: [enet], win_subsystem: 'windows') executable('server', [ 'src/server.mm', 'src/serverms.mm', 'src/serverutil.mm', 'src/tools.mm', ], objcpp_args: ['-DSTANDALONE'], dependencies: [ objfw_dep, sdl12_dep ], include_directories: [enet_includes], link_with: [enet], win_subsystem: 'console') |