build: bump libtrx version

LostArtefacts · Sep 17, 2024 · da5502e · da5502e
1 parent 6d3deb1
commit da5502e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/data/ship/cfg/TR2X_gameflow.json5 b/data/ship/cfg/TR2X_gameflow.json5
@@ -146,7 +146,7 @@
         "O_ROLLING_BALL_1": "Boulder 1",
         "O_DARTS": "Disc",
         "O_DART_EMITTER": "Disc Emitter",
-        "O_DRAW_BRIDGE": "Drawbridge",
+        "O_DRAWBRIDGE": "Drawbridge",
         "O_TEETH_TRAP": "Teeth Trap",
         "O_LIFT": "Lift",
         "O_GENERAL": "Minisub",

diff --git a/docs/progress.txt b/docs/progress.txt
@@ -2106,7 +2106,7 @@ typedef enum { // decompiled
     O_ROLLING_BALL_1        = 60,
     O_DARTS                 = 61,
     O_DART_EMITTER          = 62,
-    O_DRAW_BRIDGE           = 63,
+    O_DRAWBRIDGE            = 63,
     O_TEETH_TRAP            = 64,
     O_LIFT                  = 65,
     O_GENERAL               = 66,

diff --git a/meson.build b/meson.build
@@ -5,7 +5,16 @@ project('TR2X', ['c'],
   ],
 )
 
-trx = subproject('libtrx', default_options: {'tr_version': '2'})
+if host_machine.system() == 'darwin'
+  gfx_gl_default_backend = 'GFX_GL_33C'
+else
+  gfx_gl_default_backend = 'GFX_GL_21'
+endif
+
+trx = subproject('libtrx', default_options: {
+  'tr_version': '2',
+  'gfx_gl_default_backend': gfx_gl_default_backend,
+})
 c_compiler = meson.get_compiler('c')
 
 build_opts = [

diff --git a/src/game/objects/names.def b/src/game/objects/names.def
@@ -61,7 +61,7 @@ OBJ_NAME_DEFINE(O_SPIKES, "Spikes")
 OBJ_NAME_DEFINE(O_ROLLING_BALL_1, "Boulder 1")
 OBJ_NAME_DEFINE(O_DARTS, "Disc")
 OBJ_NAME_DEFINE(O_DART_EMITTER, "Disc Emitter")
-OBJ_NAME_DEFINE(O_DRAW_BRIDGE, "Drawbridge")
+OBJ_NAME_DEFINE(O_DRAWBRIDGE, "Drawbridge")
 OBJ_NAME_DEFINE(O_TEETH_TRAP, "Teeth Trap")
 OBJ_NAME_DEFINE(O_LIFT, "Lift")
 OBJ_NAME_DEFINE(O_GENERAL, "Minisub")

diff --git a/subprojects/libtrx b/subprojects/libtrx