Merge accidental fork

FossilOrigin-Name: f9d39991c5f75cbbf74e5c9c134864aedb1a2a5fdcec38a8f0ad64a948f87043

Makefile

@@ -1,5 +0,0 @@
-SUBDIRS = enet src
-
-src: enet
-
-include buildsys.mk

enet/meson.build

@@ -0,0 +1,14 @@
+enet_includes = include_directories('include')
+enet = static_library('enet',
+  [
+    'callbacks.c',
+    'host.c',
+    'list.c',
+    'memory.c',
+    'packet.c',
+    'peer.c',
+    'protocol.c',
+    'unix.c',
+    'win32.c',
+  ],
+  include_directories: [enet_includes])

meson.build

@@ -1,5 +1,5 @@
 project('Cube', ['c', 'objcpp'],
-  meson_version: '1.5.0')
+  meson_version: '>=1.5.0')
 
 add_global_arguments(
   [
@@ -12,86 +12,20 @@ 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)
 
-enet_includes = include_directories('enet/include')
+client_link_args = []
-enet = static_library('enet',
+server_link_args = []
-  [
+extra_deps = []
-    'enet/callbacks.c',
-    'enet/host.c',
-    'enet/list.c',
-    'enet/memory.c',
-    'enet/packet.c',
-    'enet/peer.c',
-    'enet/protocol.c',
-    'enet/unix.c',
-    'enet/win32.c',
-  ],
-  include_directories: [enet_includes])
 
-executable('client',
+if host_machine.system() == 'windows'
-  [
+  client_link_args += ['-lopengl32', '-lglu32', '-lwinmm']
-    'src/client.mm',
+  server_link_args += ['-lwinmm']
-    'src/clientextras.mm',
+else
-    'src/clientgame.mm',
+  extra_deps += dependency('gl')
-    'src/clients2c.mm',
+  extra_deps += dependency('glu')
-    'src/command.mm',
+  extra_deps += dependency('x11')
-    'src/console.mm',
+endif
-    'src/editing.mm',
-    'src/entities.mm',
-    'src/init.mm',
-    'src/main.mm',
-    'src/menus.mm',
-    'src/monster.mm',
-    'src/physics.mm',
-    'src/rendercubes.mm',
-    'src/renderextras.mm',
-    'src/rendergl.mm',
-    'src/rendermd2.mm',
-    'src/renderparticles.mm',
-    'src/rendertext.mm',
-    'src/rndmap.mm',
-    'src/savegamedemo.mm',
-    'src/server.mm',
-    'src/serverbrowser.mm',
-    'src/serverms.mm',
-    'src/serverutil.mm',
-    'src/sound.mm',
-    'src/tools.mm',
-    'src/weapon.mm',
-    'src/world.mm',
-    'src/worldio.mm',
-    'src/worldlight.mm',
-    'src/worldocull.mm',
-    'src/worldrender.mm',
-  ],
-  dependencies: [
-    objfw_dep,
-    sdl12_dep,
-    sdlimage_dep,
-    sdlmixer_dep,
-    gl_dep,
-    glu_dep,
-    zlib_dep,
-    x11_dep,
-  ],
-  include_directories: [enet_includes],
-  link_with: [enet])
 
-executable('server',
+subdir('enet')
-  [
+subdir('src')
-    '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])

src/meson.build

@@ -0,0 +1,65 @@
+executable('client',
+  [
+    'client.mm',
+    'clientextras.mm',
+    'clientgame.mm',
+    'clients2c.mm',
+    'command.mm',
+    'console.mm',
+    'editing.mm',
+    'entities.mm',
+    'init.mm',
+    'main.mm',
+    'menus.mm',
+    'monster.mm',
+    'physics.mm',
+    'rendercubes.mm',
+    'renderextras.mm',
+    'rendergl.mm',
+    'rendermd2.mm',
+    'renderparticles.mm',
+    'rendertext.mm',
+    'rndmap.mm',
+    'savegamedemo.mm',
+    'server.mm',
+    'serverbrowser.mm',
+    'serverms.mm',
+    'serverutil.mm',
+    'sound.mm',
+    'tools.mm',
+    'weapon.mm',
+    'world.mm',
+    'worldio.mm',
+    'worldlight.mm',
+    'worldocull.mm',
+    'worldrender.mm',
+  ],
+  dependencies: [
+    objfw_dep,
+    sdl12_dep,
+    sdlimage_dep,
+    sdlmixer_dep,
+    zlib_dep,
+    extra_deps
+  ],
+  include_directories: [enet_includes],
+  link_args: client_link_args,
+  link_with: [enet],
+  win_subsystem: 'windows')
+
+executable('server',
+  [
+    'server.mm',
+    'serverms.mm',
+    'serverutil.mm',
+    'tools.mm',
+  ],
+  objcpp_args: ['-DSTANDALONE'],
+  dependencies: [
+    objfw_dep,
+    sdl12_dep
+  ],
+  include_directories: [enet_includes],
+  link_args: server_link_args,
+  link_with: [enet],
+  win_subsystem: 'console')