diff --git a/INSTALL b/INSTALL index cc48f8e2..f067f4b6 100644 --- a/INSTALL +++ b/INSTALL @@ -43,11 +43,11 @@ ALSA_Headers for Alsa support under linux. Part of the linux kernel sources Licensed under LGPL -If you want compile from the CVS under a unix system, you'll also need +If you want compile from developer sources (SVN) under a unix system, you'll also need automake (>=1.6), autoconf(>=2.50). Should be available at http://www.gnu.org For building on unix systems. -If you are building from the cvs run ./autogen.sh first before doing the following. +If you are building from developer sources run ./autogen.sh first before doing the following. 1. ./configure 2. make @@ -101,4 +101,4 @@ src/ints/bios_keyboard.cpp and go to line 30 and read there how to fix it. Build instructions for VC++6 Don't use VC++ 6: it creates faulty code in core_normal.cpp -Later Visual Studio versions work fine (vs2003/.net, vs2005, vs2008) +Later Visual Studio versions work fine (vs2003/.net up to vs2010) diff --git a/scripts/dosbox-installer.nsi b/scripts/dosbox-installer.nsi index 31aee2bf..470c6783 100644 --- a/scripts/dosbox-installer.nsi +++ b/scripts/dosbox-installer.nsi @@ -2,7 +2,7 @@ !define VER_MINOR 74 !define APP_NAME "DOSBox ${VER_MAYOR}.${VER_MINOR} Installer" !define COMP_NAME "DOSBox Team" -!define COPYRIGHT "Copyright © 2002-2010 DOSBox Team" +!define COPYRIGHT "Copyright © 2002-2011 DOSBox Team" !define DESCRIPTION "DOSBox Installer" VIProductVersion "${VER_MAYOR}.${VER_MINOR}.0.0" diff --git a/src/dos/scsidefs.h b/src/dos/scsidefs.h index 85ff62a6..a8b996a4 100644 --- a/src/dos/scsidefs.h +++ b/src/dos/scsidefs.h @@ -1,12 +1,7 @@ /* Got it from Bochs */ -///////////////////////////////////////////////////////////////////////// -// $Id: scsidefs.h,v 1.3 2005-07-21 12:49:52 qbix79 Exp $ -///////////////////////////////////////////////////////////////////////// -// // // iodev/scsidefs.h -// $Id: scsidefs.h,v 1.3 2005-07-21 12:49:52 qbix79 Exp $ // // This file was copied from ... ? // diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index 5e9910f6..807d908a 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -569,7 +569,7 @@ public: Section_prop *section = static_cast(sec); new SectionEditor(getScreen(), 50, 30, section); } else if (arg == "About") { - new GUI::MessageBox(getScreen(), 200, 150, 280, "About DOSBox", "\nDOSBox 0.72\nAn emulator for old DOS Games\n\nCopyright 2002-2009\nThe DOSBox Team"); + new GUI::MessageBox(getScreen(), 200, 150, 280, "About DOSBox", "\nDOSBox 0.74\nAn emulator for old DOS Games\n\nCopyright 2002-2011\nThe DOSBox Team"); } else if (arg == "Introduction") { new GUI::MessageBox(getScreen(), 20, 50, 600, "Introduction", MSG_Get("PROGRAM_INTRO")); } else if (arg == "Getting Started") { diff --git a/src/libs/zmbv/zmbv_vfw.rc b/src/libs/zmbv/zmbv_vfw.rc index 41d82294..87fbe8a5 100644 --- a/src/libs/zmbv/zmbv_vfw.rc +++ b/src/libs/zmbv/zmbv_vfw.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -53,20 +53,20 @@ END // IDD_ABOUT DIALOGEX 0, 0, 167, 55 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "DOSBox Video Codec v0.1" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,131,34,29,14 - CTEXT "Zipped Motion Block Video v 0.1\nCopyright 2009, DOSBox Team", + CTEXT "Zipped Motion Block Video v 0.1\nCopyright 2009-2011 DOSBox Team", IDC_STATIC,7,7,153,25,SS_NOPREFIX PUSHBUTTON "Email author",IDC_EMAIL,7,34,50,14 PUSHBUTTON "Visit home page",IDC_HOMEPAGE,59,34,58,14 END IDD_CONFIGURE DIALOGEX 0, 0, 213, 146 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ZMBV configuration dialog" FONT 8, "MS Sans Serif", 0, 0, 0x0 @@ -75,7 +75,7 @@ BEGIN PUSHBUTTON "Visit home page",IDC_HOMEPAGE,109,87,58,14 DEFPUSHBUTTON "OK",IDOK,44,125,50,14 PUSHBUTTON "Cancel",IDCANCEL,117,125,50,14 - CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | + CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,57,30,92,18 END @@ -86,7 +86,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_ABOUT, DIALOG BEGIN diff --git a/src/winres.rc b/src/winres.rc index f7e63b4c..cfcc7015 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -19,12 +19,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "Comments", "© 2002-2010 DOSBox Team, published under GNU GPL" + VALUE "Comments", "© 2002-2011 DOSBox Team, published under GNU GPL" VALUE "CompanyName", "DOSBox Team" VALUE "FileDescription", "DOSBox DOS Emulator" VALUE "FileVersion", "0, 74, 0, 0" VALUE "InternalName", "DOSBox" - VALUE "LegalCopyright", "Copyright © 2002-2010 DOSBox Team" + VALUE "LegalCopyright", "Copyright © 2002-2011 DOSBox Team" VALUE "OriginalFilename", "dosbox.exe" VALUE "ProductName", "DOSBox DOS Emulator" VALUE "ProductVersion", "0, 74, 0, 0"