diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-23 19:02:59 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-04-22 22:03:39 +0300 |
| commit | 3a6c4f0fee7b1d56b9cef25d422833c7c6633dd8 (patch) | |
| tree | 4d5bb80a614ac03181b77fa5092094f9167a0df2 /overlay_winx64 | |
| parent | 4a478f7f04d11dcda7a63c4103830a555803f045 (diff) | |
Build two separate Windows overlays - one for x86 and one for x86_64.
This splits fx11 into an x86 variant and an x64 variant.
This creates effects11_x86.lib and effects11_x64.lib, instead
of the single effects11.lib we had previously.
The minhook build is also tweaked. However, since minhook
is only used on x86_64, it is only built for x86_64.
Consequently, the library is still called minhook.lib.
The overlay itself is split into mumble_ol.dll and mumble_ol.exe
for x86, and mumble_ol_x64.dll and mumble_ol_x64.exe for x86_64.
Diffstat (limited to 'overlay_winx64')
| -rw-r--r-- | overlay_winx64/mumble_ol.rc | 44 | ||||
| -rw-r--r-- | overlay_winx64/overlay_exe_winx64/overlay_exe.rc | 44 | ||||
| -rw-r--r-- | overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro | 4 | ||||
| -rw-r--r-- | overlay_winx64/overlay_winx64.pro | 4 |
4 files changed, 96 insertions, 0 deletions
diff --git a/overlay_winx64/mumble_ol.rc b/overlay_winx64/mumble_ol.rc new file mode 100644 index 000000000..33d157a31 --- /dev/null +++ b/overlay_winx64/mumble_ol.rc @@ -0,0 +1,44 @@ +#include <winver.h> + +#ifndef DEBUG +#define VER_DEBUG 0L +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +#ifdef SNAPSHOT_BUILD +#define VER_RELEASE VS_FF_SPECIALBUILD|VS_FF_PRERELEASE +#else +#define VER_RELEASE 0L +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS (VER_DEBUG|VER_RELEASE) + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "Thorvald Natvig" + VALUE "FileDescription", "Mumble - Low-latency VoIP client" + VALUE "FileVersion", "1.3.0" + VALUE "ProductVersion", "1.3.0" + VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>" + VALUE "OriginalFilename", "mumble_ol_x64.dll" + VALUE "ProductName", "Mumble" +#ifdef SNAPSHOT_BUILD + VALUE "SpecialBuild", "Snapshot development release" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END + END diff --git a/overlay_winx64/overlay_exe_winx64/overlay_exe.rc b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc new file mode 100644 index 000000000..2b947f616 --- /dev/null +++ b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc @@ -0,0 +1,44 @@ +#include <winver.h> + +#ifndef DEBUG +#define VER_DEBUG 0L +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +#ifdef SNAPSHOT_BUILD +#define VER_RELEASE VS_FF_SPECIALBUILD|VS_FF_PRERELEASE +#else +#define VER_RELEASE 0L +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS (VER_DEBUG|VER_RELEASE) + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "Thorvald Natvig" + VALUE "FileDescription", "Mumble - Low-latency VoIP client" + VALUE "FileVersion", "1.3.0" + VALUE "ProductVersion", "1.3.0" + VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>" + VALUE "OriginalFilename", "mumble_ol_x64.exe" + VALUE "ProductName", "Mumble" +#ifdef SNAPSHOT_BUILD + VALUE "SpecialBuild", "Snapshot development release" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END + END diff --git a/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro b/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro new file mode 100644 index 000000000..9669aa845 --- /dev/null +++ b/overlay_winx64/overlay_exe_winx64/overlay_exe_winx64.pro @@ -0,0 +1,4 @@ +CONFIG += force-x86_64-toolchain +VPATH = ../../overlay/overlay_exe +include(../../overlay/overlay_exe/overlay_exe-shared.pro) +TARGET = mumble_ol_x64 diff --git a/overlay_winx64/overlay_winx64.pro b/overlay_winx64/overlay_winx64.pro new file mode 100644 index 000000000..f9eaa3b00 --- /dev/null +++ b/overlay_winx64/overlay_winx64.pro @@ -0,0 +1,4 @@ +CONFIG += force-x86_64-toolchain +VPATH = ../overlay +include(../overlay/overlay-shared.pro) +TARGET = mumble_ol_x64 |