From 51b783e85a514831aca24814d733ce2de689d80a Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Mon, 2 Feb 2015 19:42:25 +0000 Subject: [PATCH] cmake: Fixes to allow MSVC to compile running is another story Author: Ronald Kinard Date: Wed Jan 28 02:09:03 2015 -0600 git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9013 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd --- cmake/Modules/FindSDL2.cmake | 11 +++++++++++ src/doomdef.h | 1 + 2 files changed, 12 insertions(+) diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake index faa556a88..7939b7d52 100644 --- a/cmake/Modules/FindSDL2.cmake +++ b/cmake/Modules/FindSDL2.cmake @@ -27,8 +27,19 @@ find_library(SDL2_LIBRARY "/usr/local/lib" ) +find_library(SDL2_MAIN_LIBRARY + NAMES SDL2_main + PATHS + ${SDL2_PKGCONF_LIBRARY_DIRS} + /usr/lib + /usr/local/lib +) + # set include dir variables set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR) set(SDL2_PROCESS_LIBS SDL2_LIBRARY) +set(SDL2_MAIN_PROCESS_INCLUDES SDL2_INCLUDE_DIR) +set(SDL2_MAIN_PROCESS_LIBS SDL2_MAIN_LIBRARY) libfind_process(SDL2) +libfind_process(SDL2_MAIN) diff --git a/src/doomdef.h b/src/doomdef.h index 4334e2c80..c3e2f2402 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -147,6 +147,7 @@ extern FILE *logstream; #define VERSION 202 // Game version #define SUBVERSION 0 // more precise version number #define VERSIONSTRING "v2.2" +#define VERSIONSTRINGW L"v2.2" // Hey! If you change this, add 1 to the MODVERSION below! // Otherwise we can't force updates! #endif