Cube  Check-in [f9d39991c5]

Overview
Comment:Merge accidental fork
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f9d39991c5f75cbbf74e5c9c134864aedb1a2a5fdcec38a8f0ad64a948f87043
User & Date: js on 2024-08-05 00:31:12
Other Links: manifest | tags
Context
2025-03-02
14:02
Migrate to OFApplicationDelegate check-in: 9432e52ca0 user: js tags: trunk
2024-08-05
00:31
Merge accidental fork check-in: f9d39991c5 user: js tags: trunk
2024-08-04
22:26
Fix building on Windows check-in: f00c286569 user: js tags: trunk
2024-08-03
17:11
Improve clang-format file check-in: 2bc02cf470 user: js tags: trunk
Changes

Deleted Makefile version [0c78c227ba].

Added enet/meson.build version [4ef18161bf].

Modified meson.build from [e523f05d4d] to [c35ae25a1c].

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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85

86
87
88
89
90
91
92
93
94
95
96
97
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')
gl_dep = dependency('gl')
glu_dep = dependency('glu')
zlib_dep = dependency('zlib')
x11_dep = dependency('x11', required: false)

enet_includes = include_directories('enet/include')
enet = static_library('enet',
  [
    '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',
  [
    'src/client.mm',
    'src/clientextras.mm',
    'src/clientgame.mm',
    'src/clients2c.mm',
    'src/command.mm',
    'src/console.mm',
    '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',
  [

    '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])

|












<
<

<

<
|
<
<
<
<
<
<
<
<
<
<
<
<
|
<
<
<
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
|
|
|
<
|
<
<
|
<
<
<
<
<
<
<
|
<
<
<
<
|
|
<
<
<
<
<
|
<
|
>
|
<
<
<
<
<
<
<
<
<
<
<
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











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')



client_link_args = []












server_link_args = []



extra_deps = []


















if host_machine.system() == 'windows'
  client_link_args += ['-lopengl32', '-lglu32', '-lwinmm']

  server_link_args += ['-lwinmm']


else







  extra_deps += dependency('gl')




  extra_deps += dependency('glu')
  extra_deps += dependency('x11')





endif


subdir('enet')
subdir('src')











Added src/meson.build version [20649ef684].