diff options
| author | Arnon Gilboa <agilboa@redhat.com> | 2011-05-24 12:29:13 +0300 |
|---|---|---|
| committer | Arnon Gilboa <agilboa@redhat.com> | 2011-05-24 12:29:13 +0300 |
| commit | 31358b640be13c3b0955fc9acc1ad9526cc280ec (patch) | |
| tree | 28343f38089fd919e4bbfd92dc38c681dce5fd8f | |
| parent | 04595c74ada945fcc2a1c5b37208cfae844b5bf6 (diff) | |
client/windows: init PACKAGE_VERSION
in windows, we set PACKAGE_VERSION to the binary version
since we don't have config.h as generated by linux configure
| -rw-r--r-- | client/common.h | 2 | ||||
| -rw-r--r-- | client/windows/main.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/client/common.h b/client/common.h index 522f22be..130a7bd4 100644 --- a/client/common.h +++ b/client/common.h @@ -50,6 +50,8 @@ #define strcasecmp stricmp +extern const char* PACKAGE_VERSION; + #else #include <unistd.h> #include <X11/X.h> diff --git a/client/windows/main.cpp b/client/windows/main.cpp index a85acec9..99998afa 100644 --- a/client/windows/main.cpp +++ b/client/windows/main.cpp @@ -38,7 +38,7 @@ static void init_winsock() } } -char* version_string = "???"; +const char* PACKAGE_VERSION = "???"; static char _version_string[40]; static void init_version_string() @@ -63,7 +63,7 @@ static void init_version_string() file_info->dwFileVersionMS & 0x0ffff, file_info->dwFileVersionLS >> 16, file_info->dwFileVersionLS & 0x0ffff); - version_string = _version_string; + PACKAGE_VERSION = _version_string; } int WINAPI WinMain(HINSTANCE hInstance, @@ -79,7 +79,7 @@ int WINAPI WinMain(HINSTANCE hInstance, init_version_string(); pthread_win32_process_attach_np(); init_winsock(); - exit_val = Application::main(__argc, __argv, version_string); + exit_val = Application::main(__argc, __argv, PACKAGE_VERSION); LOG_INFO("Spice client terminated (exitcode = %d)", exit_val); } catch (Exception& e) { LOG_ERROR("unhandle exception: %s", e.what()); |