add windows icon to meson

Author: HeliumAnt

Lua/meson.build

@@ -22,4 +22,5 @@ else
 error('Unsupported compiler')
 endif
 
-lua_bindings = static_library('lua_bindings', lua_sources, dependencies:deps + luabind_dep, include_directories: [source_inc_dirs, external_inc_dirs], cpp_args: luabindings_cpp_args, cpp_pch:pch, override_options: defaults_override)
+lua_bindings = static_library('lua_bindings', lua_sources, dependencies:deps + luabind_dep, include_directories: [source_inc_dirs, external_inc_dirs], cpp_args: luabindings_cpp_args, cpp_pch:pch, override_options: defaults_override)
+source_libs += lua_bindings

Managers/meson.build

@@ -33,4 +33,5 @@ else
 error('Unsupported compiler')
 endif
 
-luaman = static_library('LuaMan', 'LuaMan.cpp', dependencies:deps + luabind_dep, include_directories: [source_inc_dirs, external_inc_dirs], cpp_args: luaman_cpp_args, cpp_pch:pch, override_options: defaults_override)
+luaman = static_library('LuaMan', 'LuaMan.cpp', dependencies:deps + luabind_dep, include_directories: [source_inc_dirs, external_inc_dirs], cpp_args: luaman_cpp_args, cpp_pch:pch, override_options: defaults_override)
+source_libs += luaman

Resources/meson.build

@@ -1,6 +1,12 @@
 # User frontend
-desktop_file = files('cccp.desktop')
-icon_file = files('cccp.xpm')
-configure_file(input: 'cccp.desktop', output: 'CortexCommand.desktop', install: true, install_dir:get_option('datadir')/'applications', install_mode: 'rw-r--r--', configuration: conf_data)
-install_data('cccp.xpm', install_dir: get_option('datadir')/'icons/hicolor/32x32/apps', install_mode:'rw-r--r--')
-configure_file(input: 'cccp.sh', output:'CortexCommand', install: get_option('install_runner'), install_dir: get_option('bindir'), install_mode:'rwxr-xr-x', configuration: conf_data)
+if host_machine.system() == 'linux'
+    desktop_file = files('cccp.desktop')
+    icon_file = files('cccp.xpm')
+    configure_file(input: 'cccp.desktop', output: 'CortexCommand.desktop', install: true, install_dir:get_option('datadir')/'applications', install_mode: 'rw-r--r--', configuration: conf_data)
+    install_data('cccp.xpm', install_dir: get_option('datadir')/'icons/hicolor/32x32/apps', install_mode:'rw-r--r--')
+    configure_file(input: 'cccp.sh', output:'CortexCommand', install: get_option('install_runner'), install_dir: get_option('bindir'), install_mode:'rwxr-xr-x', configuration: conf_data)
+elif host_machine.system() == 'windows'
+    windows = import('windows')
+    winrc = windows.compile_resources('RTEA.rc', depend_files: files('resource.h', 'ccicon.ico', 'ccicon32.ico'), include_directories: '.')
+    sources += winrc
+endif

meson.build

@@ -148,6 +148,7 @@ deps += [allegro_dep, loadpng_dep, raknet_dep, boost_dep]
 #### Sources Setup ####
 pch = meson.current_source_dir()/'System/StandardIncludes.h'
 sources = []
+source_libs = []
 source_inc_dirs = include_directories(
   '.',
   'Activities',
@@ -173,7 +174,7 @@ subdir('Resources')
 #### Target Definitions ####
 cccpelf = executable(
   elfname, ['Main.cpp', sources], include_directories:[source_inc_dirs, external_inc_dirs], cpp_pch:pch, # Sources options
-  link_with:[external_libs, lua_bindings, luaman], objects:[external_objects], dependencies:deps,                                # Link options
+  link_with:[external_libs, source_libs], objects:[external_objects], dependencies:deps,                                # Link options
   cpp_args:[extra_args, preprocessor_flags], link_args:[link_args], build_rpath:build_rpath,               # Compiler setup
   name_suffix:suffix,   # Executable name options
   build_by_default:true, # Meson options