2006-07-01 07:14:56 +00:00
|
|
|
|
#include <windows.h>
|
|
|
|
|
|
#include <commctrl.h>
|
|
|
|
|
|
#include "startwin.editor.h"
|
2006-07-01 02:01:18 +00:00
|
|
|
|
|
2006-07-01 07:14:56 +00:00
|
|
|
|
RSRC_ICON ICON "rsrc/build_icon.ico"
|
|
|
|
|
|
RSRC_BMP BITMAP "rsrc/build.bmp"
|
|
|
|
|
|
|
|
|
|
|
|
WIN_STARTWIN DIALOGEX DISCARDABLE 20, 40, 260, 200
|
|
|
|
|
|
STYLE DS_MODALFRAME | DS_CENTER | DS_SETFONT | DS_FIXEDSYS | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
|
|
|
|
|
|
CAPTION "Startup"
|
|
|
|
|
|
FONT 8, "MS Shell Dlg"
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
CONTROL "", WIN_STARTWIN_BITMAP, "STATIC", SS_BITMAP | WS_CHILD | WS_VISIBLE, 0, 0, 32, 32
|
|
|
|
|
|
CONTROL "", WIN_STARTWIN_TABCTL, WC_TABCONTROL, WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 5, 250, 170
|
|
|
|
|
|
CONTROL "&Start", WIN_STARTWIN_START, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 154, 180, 48, 14
|
|
|
|
|
|
CONTROL "&Cancel", WIN_STARTWIN_CANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 207, 180, 48, 14
|
|
|
|
|
|
|
|
|
|
|
|
CONTROL "", WIN_STARTWIN_MESSAGES, "EDIT", ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VSCROLL, 0, 0, 32, 32
|
|
|
|
|
|
END
|
|
|
|
|
|
|
|
|
|
|
|
WIN_STARTWINPAGE_CONFIG DIALOGEX DISCARDABLE 20, 40, 279, 168
|
|
|
|
|
|
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
|
|
|
|
|
|
CAPTION "Dialog"
|
|
|
|
|
|
FONT 8, "MS Shell Dlg"
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
CONTROL "&2D Video mode:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 8, 50, 8
|
|
|
|
|
|
CONTROL "", IDC2DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 6, 80, 56
|
|
|
|
|
|
CONTROL "&Fullscreen", IDCFULLSCREEN, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 8, 49, 10
|
|
|
|
|
|
CONTROL "&3D Video mode:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 24, 50, 8
|
|
|
|
|
|
CONTROL "", IDC3DVMODE, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 22, 80, 56
|
2008-12-19 00:53:54 +00:00
|
|
|
|
CONTROL "&Always show this window at startup", IDCALWAYSSHOW, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 118, 116, 140, 8
|
2006-07-01 07:14:56 +00:00
|
|
|
|
END
|
|
|
|
|
|
|
2010-05-25 10:56:00 +00:00
|
|
|
|
#define FILEVER 1,9,9,9
|
|
|
|
|
|
#define PRODUCTVER 1,9,9,9
|
|
|
|
|
|
#define STRFILEVER "2.0.0devel\0"
|
|
|
|
|
|
#define STRPRODUCTVER "2.0.0devel\0"
|
2009-09-28 00:01:06 +00:00
|
|
|
|
|
|
|
|
|
|
VS_VERSION_INFO VERSIONINFO
|
|
|
|
|
|
FILEVERSION FILEVER
|
|
|
|
|
|
PRODUCTVERSION PRODUCTVER
|
|
|
|
|
|
FILEFLAGSMASK 0x3fL
|
|
|
|
|
|
#ifdef _DEBUG
|
|
|
|
|
|
FILEFLAGS 0x3L
|
|
|
|
|
|
#else
|
|
|
|
|
|
FILEFLAGS 0x2L
|
|
|
|
|
|
#endif
|
|
|
|
|
|
FILEOS 0x40004L
|
|
|
|
|
|
FILETYPE 0x1L
|
|
|
|
|
|
FILESUBTYPE 0x0L
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
BLOCK "StringFileInfo"
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
BLOCK "040904b0"
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
VALUE "FileDescription", "Mapster32"
|
|
|
|
|
|
VALUE "FileVersion", STRFILEVER
|
|
|
|
|
|
VALUE "InternalName", "Mapster32"
|
2010-05-25 10:56:00 +00:00
|
|
|
|
VALUE "LegalCopyright", "Copyright <20> 2010 EDuke32 Developers, 1996, 2003 3D Realms Entertainment"
|
2009-09-28 00:01:06 +00:00
|
|
|
|
VALUE "LegalTrademarks", "Duke Nukem<65> is a Registered Trademark of Apogee Software, Ltd."
|
|
|
|
|
|
VALUE "OriginalFilename", "mapster32.exe"
|
|
|
|
|
|
VALUE "ProductName", "Mapster32"
|
|
|
|
|
|
VALUE "ProductVersion", STRPRODUCTVER
|
|
|
|
|
|
END
|
|
|
|
|
|
END
|
|
|
|
|
|
BLOCK "VarFileInfo"
|
|
|
|
|
|
BEGIN
|
|
|
|
|
|
VALUE "Translation", 0x409, 1200
|
|
|
|
|
|
END
|
2008-08-11 09:10:52 +00:00
|
|
|
|
END
|
|
|
|
|
|
|
Win64 support! (Meaning it works, not that we recommend it for everyday use.)
This includes a complete Windows header and library refresh, including the addition of 64-bit compiled libs:
*libogg 1.3.0
*libvorbis 1.3.3
*zlib 1.2.7
*libpng 1.5.13
*libvpx 9a3de881c0e681ba1a79a166a86308bbc84b4acd
*SDL_mixer 1.2.12 (for RENDERTYPE=SDL)
*DirectX import libraries: dsound and dxguid (now included)
To build in 64-bit, you essentially need MinGW's MSYS (but not MinGW itself) and MinGW-w64 at the top of your PATH. The target is automatically detected using `$(CC) -dumpmachine`. The EDukeWiki will get detailed instrucitons.
All compiler and linker warnings when building in 64-bit mode have been fixed.
Remaining 64-bit to-do:
- The ebacktrace dll does not build under 64-bit. It uses code specific to the format of 32-bit executables and will have to be ported to work with 64-bit executables. A future 64-bit version will be named ebacktrace1-64.dll.
- RENDERTYPE=SDL crashes in SDL_mixer's Mix_Linked_Version().
- DirectInput gives an error and does not function. This only affects joysticks, and the error never happens without any plugged in.
- Port the classic renderer ASM to 64-bit. (Just kidding, this is way out of my league.)
This commit includes a fair bit of Makefile development spanning all platforms, including simplifying the SDLCONFIG code, fixing build on Mac OS X (thanks rhoenie!), globally factoring Apple brew/port inclusion, enforcing that all -L come before all -l, and ensuring that $(shell ) is always :='d.
In addition, I have resurrected the old GCC_MAJOR and GCC_MINOR detection using `$(CC) -dumpversion`, but I have made it failsafe in case the command fails or the version is manually specified. I have applied this new fine-grained detection where applicable, including allowing LTO, and restraining -W's to versions that support them.
git-svn-id: https://svn.eduke32.com/eduke32@3278 1a8010ca-5511-0410-912e-c29ae57300e0
2012-12-13 02:37:20 +00:00
|
|
|
|
#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
|
|
|
|
|
|
1 24 "rsrc/64/manifest.build.xml"
|
|
|
|
|
|
#else
|
|
|
|
|
|
1 24 "rsrc/32/manifest.build.xml"
|
|
|
|
|
|
#endif
|
