Merge pull request #241 from cortex-command-community/linux-build-fixes

Linux build fixes

Author: garethyr

README.md

@@ -39,7 +39,7 @@ The Linux build uses the meson build system, and builds against system libraries
 
 Dependencies:
 
-* `g++>=8.1` (needs to support c++17)
+* `g++>=8.1` (needs to support c++17 filesystem)
 * `allegro4`
 * `loadpng`
 * `flac`
@@ -48,41 +48,44 @@ Dependencies:
 * `lz4`
 * `libpng`
 * `libX11`
-* `meson>=0.49`
+* `meson>=0.43`
 * `boost>=1.55`
 * `xorg-misc-fonts`
 
 Building:
 
 1. Install Dependencies (see below for some distro-specific instructions)
 
-2. Clone this Source Repository and the [Data Respository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data), folder structure doesn't really matter here
+2. Clone this Source Repository and the [Data Respository](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data)
 
 3. open a terminal in the Source Repository
 
 4. `meson builddir`
 
 5. `cd builddir`
 
-6. `meson compile` or `meson [-j<num of threads>] compile CCCP` if you want a release build
-  If the build fails because of memory shortage you may need to reduce the number of build threads (meson will use all available threads by default) using the `-j<number of threads>` option
+For `meson` versions `>=0.54` (check `meson --version`):
+
+6. `meson compile` for debug build, or `meson compile CCCP` for a release build. If the build fails because of memory shortage you may need to reduce the number of build threads (meson will use all available threads by default) using the `-j<number of threads>` option, if this doesn't help increase your swap size to at least 6Gb
+
+For `meson` versions `<0.54`
+
+6. `ninja` for debug builds, or `ninja CCCP.x86_64` for release builds. Using the `-j<number of threads>` option will also work here.
 
 
 Running:
 
-1. Copy (or link, preferable for quick debug builds) `builddir/CCCP_debug.x86_64` or `builddir/CCCP.x86_64` (depending on if you made a release build) into the **Data Repository**
+1. Copy (or link, might be preferable for testing builds) `builddir/CCCP_debug.x86_64` or `builddir/CCCP.x86_64` (depending on if you made a release build) into the **Data Repository**
 
 2. Copy `Scenes.rte` and `Metagames.rte` from your purchased copy of Cortex Command into **Data Repository**
 
-3. Copy (or link) `libfmod.so.11` from `<Source Repository Root>/external/lib/linux/x86_64` into the **Data Repository**
-
-4. Run `env LD_LIBRARY_PATH=. ./CCCP.x86_64` or `./CCCP_debug.x86_64` in the **Data Repository**
+3. Run `./CCCP.x86_64` or `./CCCP_debug.x86_64` in the **Data Repository**
 
 ### Arch Linux ###
 `# pacman -S allegro4 flac luajit minizip lz4 libpng libx11 meson xorg-fonts-misc`
 
 ### Ubuntu ###
-`# apt-get install liballegro4.4 libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev meson`
+`# apt-get install liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev meson`
 
 ### Troubleshooting ###
 Until borderless windows are implemented, you might seem get stuck in fullscreen mode. Try Alt-Return, or if that doesn't work kill CC with ctrl-alt-end.

external/lib/linux/x86_64/libfmod.so

@@ -0,0 +1 @@
+libfmod.so.11

meson.build

@@ -1,4 +1,4 @@
-project('CCOSS-community', ['cpp','c'], default_options:['cpp_std=c++17'])
+project('CCOSS-community', ['cpp','c'], default_options:['cpp_std=c++17'], version:'0.1.0-Pre-3')
 
 source_inc_dirs = include_directories('Activities',
           'Entities',
@@ -21,13 +21,17 @@ deps = [
   ]
 
 compiler = meson.get_compiler('cpp')
-
+link_args=[]
+extra_args=[]
 
 if meson.get_compiler('cpp').get_id() == 'gcc'
-  extra_args = ['-pedantic','-fpermissive', '-Wno-write-strings', '-Wno-unknown-pragmas']
+  extra_args = ['-fpermissive', '-Wno-write-strings', '-Wno-unknown-pragmas']
+  release_args = ['-w']
   suffix = 'x86_64'
+  if compiler.version().version_compare('<9')
+    link_args += ['-lstdc++fs']
+  endif
 elif meson.get_compiler('cpp').get_id() == 'msvc'
-  extra_args = []
 endif
 
 pch = 'System/StandardIncludes.h'
@@ -43,11 +47,11 @@ subdir('external')
 
 debug = executable('CCCP_debug', 'Main.cpp',sources, link_with: [luabind_debug, raknet_debug, fmod],
             dependencies: [deps], include_directories:[source_inc_dirs, external_inc_dirs],
-            cpp_args:extra_args, cpp_pch:pch, name_suffix:suffix, override_options:['buildtype=debugoptimized', 'optimization=g'])
+            cpp_args:extra_args, link_args:link_args, cpp_pch:pch, name_suffix:suffix, override_options:['buildtype=debugoptimized', 'optimization=g'])
 
 release = executable('CCCP', 'Main.cpp', sources, link_with: [luabind, raknet, fmod],
             dependencies: [deps], include_directories:[source_inc_dirs, external_inc_dirs],
-            cpp_args:extra_args, cpp_pch:pch, name_suffix:suffix, build_by_default:false, override_options:['buildtype=release', 'optimization=3', 'debug=false'])
+            cpp_args:extra_args, link_args:link_args+release_args, cpp_pch:pch, name_suffix:suffix, build_by_default:false, override_options:['buildtype=release', 'optimization=3', 'debug=false'])
 
 #AppImage Targeting
 wget = find_program('wget')