Various fixes for mingw

This commit is contained in:
Patrick Griffis
2018-03-05 19:25:08 -05:00
parent 9b8a7eaa01
commit e9b9ff9f38
13 changed files with 61 additions and 33 deletions

View File

@@ -5,7 +5,8 @@ sysinfo_sources = [
sysinfo_deps = [
libgio_dep,
hexchat_plugin_dep
hexchat_plugin_dep,
common_sysinfo_deps,
]
sysinfo_includes = []
@@ -41,7 +42,10 @@ if system == 'linux' or system == 'darwin'
endif
elif system == 'windows'
sysinfo_sources += 'win32/backend.c'
sysinfo_sources += [
'win32/backend.c',
'../../src/common/sysinfo/win32/backend.c'
]
else
error('sysinfo: Unknown system?')
endif

View File

@@ -30,14 +30,7 @@
#include "../format.h"
static int command_callback (char *word[], char *word_eol[], void *user_data);
void print_info (void);
guint64 hdd_capacity;
guint64 hdd_free_space;
char *read_hdd_info (IWbemClassObject *object);
char *get_memory_info (void);
static char *get_memory_info (void);
char *
sysinfo_backend_get_sound (void)
@@ -98,11 +91,6 @@ sysinfo_backend_get_os (void)
return sysinfo_get_os ();
}
static int get_cpu_arch (void)
{
return sysinfo_get_cpu_arch ();
}
static char *get_memory_info (void)
{
MEMORYSTATUSEX meminfo = { 0 };