From 1f48cca77fbb33f2f26b9ea0f84829235901d0a4 Mon Sep 17 00:00:00 2001
From: Jammyjamjamman <jdsherratt3@gmail.com>
Date: Sun, 28 Aug 2022 02:07:09 +0100
Subject: [PATCH] Everything builds!

---
 meson.build                         | 29 ++-----------------
 source/g3d_viewer/meson.build       | 45 +++++++++++++++++++++++++++++
 source/glest_map_editor/meson.build |  1 -
 source/meson.build                  |  1 -
 source/tools/glexemel/meson.build   |  8 +++++
 5 files changed, 56 insertions(+), 28 deletions(-)
 create mode 100644 source/g3d_viewer/meson.build
 delete mode 100644 source/meson.build
 create mode 100644 source/tools/glexemel/meson.build

diff --git a/meson.build b/meson.build
index 67b0be411..b4d5dc0d6 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
   ['c', 'cpp'],
   version: '3.13.0.999',
   meson_version : '>= 0.53.2',
-  default_options: ['warning_level=1']
+  default_options: ['warning_level=1', 'buildtype=release']
   )
 
 # Setup compiler.
@@ -12,31 +12,8 @@ cc = meson.get_compiler('c')
 
 add_global_arguments(['-DUSE_FTGL'], language: 'cpp')
 
-#add_global_arguments(
-#  [
-#    # '-DUSE_STREFLOP',
-#    '-DSTREFLOP_SOFT',
-#    # '-DSTREFLOP_RANDOM_GEN_SIZE=32',
-#    '-DLIBM_COMPILING_FLT32',
-#    '-DN_SPECIALIZED=32',
-#    '-frounding-math',
-#    '-fsignaling-nans',
-#    # '-Wno-switch',
-#    # '-Wuninitialized',
-#    # '-Wsign-compare',
-#    # '-Wunused-function',
-#    # '-Wunused-variable',
-#    # '-Wreturn-type',
-#    '-fno-strict-aliasing',
-#    '-DHAVE_SYS_IOCTL_H',
-#    '-DUNICODE',
-#    # '-O3',
-#    # '-w',
-#  ],
-#  language: 'cpp')
-
 subdir('source/shared_lib')
 subdir('source/glest_game')
 subdir('source/glest_map_editor')
-
-#subdir('source')
+subdir('source/g3d_viewer')
+subdir('source/tools/glexemel')
diff --git a/source/g3d_viewer/meson.build b/source/g3d_viewer/meson.build
new file mode 100644
index 000000000..ebcf61fc8
--- /dev/null
+++ b/source/g3d_viewer/meson.build
@@ -0,0 +1,45 @@
+src_g3d_viewer = [
+    'main.cpp',
+    'renderer.cpp',
+    '../glest_game/global/config.cpp',
+    '../glest_game/graphics/unit_particle_type.cpp',
+    '../glest_game/graphics/particle_type.cpp',
+
+]
+
+inc_common = [
+    '../shared_lib/include/graphics',
+    '../shared_lib/include/platform/sdl',
+    '../shared_lib/include/platform/common',
+    '../shared_lib/include/util',
+    '../shared_lib/include/xml',
+    '../shared_lib/include/map',
+    '../shared_lib/include/graphics/gl',
+    '../shared_lib/include/sound',
+    '../glest_game/global',
+    '../glest_game/game',
+    '../glest_game/graphics',
+    '../glest_game/facilities',
+    '../glest_game/sound',
+]
+
+dep_xercesc = dependency('XercesC')
+
+executable('megaglest_g3d_viewer',
+  src_g3d_viewer,
+  include_directories: inc_common,
+  dependencies: [
+    dep_libmegaglest,
+    dep_wx,
+    dep_sdl,
+    dep_gl,
+    dep_x11,
+    dep_jpeg,
+    dep_png,
+    dep_glew,
+    dep_xercesc
+  ],
+#   cpp_args: [
+#     '-DNDEBUG',
+#     ]
+)
diff --git a/source/glest_map_editor/meson.build b/source/glest_map_editor/meson.build
index 52888958b..6c44ce142 100644
--- a/source/glest_map_editor/meson.build
+++ b/source/glest_map_editor/meson.build
@@ -14,7 +14,6 @@ inc_common = [
   '../glest_game/global',
   '../glest_game/game',
   '../glest_game/facilities',
-  '.',
 ]
 
 dep_wx = dependency('wxwidgets', version : '>=3.0.0', modules : ['gl', 'core', 'base'])
diff --git a/source/meson.build b/source/meson.build
deleted file mode 100644
index 3106a579b..000000000
--- a/source/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-subdir('shared_lib')
diff --git a/source/tools/glexemel/meson.build b/source/tools/glexemel/meson.build
new file mode 100644
index 000000000..f0e5dd515
--- /dev/null
+++ b/source/tools/glexemel/meson.build
@@ -0,0 +1,8 @@
+executable('g2xml',
+    'g2xml.c'
+)
+
+executable('xml2g',
+    'xml2g.c',
+    dependencies: dependency('libxml2')
+)