diff --git a/CHANGELOG b/CHANGELOG index 8650d8e6b..8b24de434 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Next version +2025.10.07 - INT 21h AH=4Ah resize memory: Compact free blocks only at or after the segment being resized, as MS-DOS is documented to do (joncampbell123). - INT 21h AH=4Ah resize memory: Fix bug where, if asked to resize a previously diff --git a/configure.ac b/configure.ac index 5d2152c31..5f67c3d3f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2025.05.03,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2025.10.07,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) COPYRIGHT_YEAR=`echo $PACKAGE_VERSION | cut -c1-4` AC_SUBST([COPYRIGHT_YEAR]) AC_PREREQ(2.60) diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index 849d978b1..fd70164d1 100644 --- a/contrib/translations/de/de_DE.lng +++ b/contrib/translations/de/de_DE.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng index aabc60a39..dedec391e 100644 --- a/contrib/translations/de/de_pc98.lng +++ b/contrib/translations/de/de_pc98.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index 9bbc6233a..293778e70 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index b5f8beba6..7b3ebf6fc 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index 424186060..9011ea44a 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:859 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/hu/hu_HU.lng b/contrib/translations/hu/hu_HU.lng index 4989ddf78..5a70c90b6 100644 --- a/contrib/translations/hu/hu_HU.lng +++ b/contrib/translations/hu/hu_HU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Hungarian (Hungary) :DOSBOX-X:CODEPAGE:852 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Ebben a szekcióban lévő sorok indításkor lefutnak. diff --git a/contrib/translations/it/it_IT.lng b/contrib/translations/it/it_IT.lng index 4a4a3f3e2..99de1aa8f 100644 --- a/contrib/translations/it/it_IT.lng +++ b/contrib/translations/it/it_IT.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Italiano (Italy) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Le righe in questa sezione simulano AUTOEXEC.BAT e sono eseguite all'avvio diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index f81f3b3f1..d72f43490 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index c0d719c67..f5b8c2bfa 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng index 679e382d3..3a98450cf 100644 --- a/contrib/translations/nl/nl_NL.lng +++ b/contrib/translations/nl/nl_NL.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Nederlands (Nederland) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lijnen in dit gedeelte worden uitgevoerd bij opstarten. diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index 9ce469070..62dea2ffb 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. diff --git a/contrib/translations/ru/ru_RU.lng b/contrib/translations/ru/ru_RU.lng index 5371b90e7..d4c5af221 100644 --- a/contrib/translations/ru/ru_RU.lng +++ b/contrib/translations/ru/ru_RU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Russian (Russia) :DOSBOX-X:CODEPAGE:866 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Строки в этом разделе будут выполнены при запуске. diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index 6c24017d1..ca3211935 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 6d092e2a3..1542d0f99 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK:配置完中文语言与字体后,就可以直接支持中文显示和打印。国家和代码页选项可以留空,或设为 “86,936”。 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index ea8984825..8544b5819 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:2025.05.03 +:DOSBOX-X:VERSION:2025.10.07 :DOSBOX-X:REMARK:設定好中文語言與字型後,就可以直接支援中文顯示和列印。國家和字碼頁選項可以留空,或設為「886,950」、「886,951」。譯者註:932 字碼頁的中文語言檔(用於 PC-98、JEGA、DOS/V)可至 https://github.com/1abcd/dosbox-x/issues/2 下載。 :AUTOEXEC_CONFIGFILE_HELP 區段中的指令行會在啟動時執行. diff --git a/contrib/windows/installer/DOSBox-X-installer.iss b/contrib/windows/installer/DOSBox-X-installer.iss index 259ec0c35..de5481c8d 100644 --- a/contrib/windows/installer/DOSBox-X-installer.iss +++ b/contrib/windows/installer/DOSBox-X-installer.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2025.05.03" +#define MyAppVersion "2025.10.07" #define MyAppBit "(32/64bit for Windows)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/DOSBox-X-setupXP.iss b/contrib/windows/installer/DOSBox-X-setupXP.iss index 554c71040..46c1f93be 100644 --- a/contrib/windows/installer/DOSBox-X-setupXP.iss +++ b/contrib/windows/installer/DOSBox-X-setupXP.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2025.05.03" +#define MyAppVersion "2025.10.07" #define MyAppBit "(32/64bit for XP)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index b79f2d510..de2a7ac5a 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2025.05.03. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.10.07. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 4f684cab0..f552621d1 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2025.05.03. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.10.07. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index a3acc6810..bf9fc7146 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2025.05.03. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.10.07. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/src/winres.rc b/src/winres.rc index a4b7d8569..dc6404699 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -3,7 +3,7 @@ #include "../include/resource.h" #include "../vs/config_package.h" -#define VERSION_NUMBER 2025,05,03,0 +#define VERSION_NUMBER 2025,10,07,0 // icon resource dosbox_ico ICON "../contrib/icons/dosbox-x.ico" diff --git a/vs/config_package.h b/vs/config_package.h index d1444104d..7a4ff4c22 100644 --- a/vs/config_package.h +++ b/vs/config_package.h @@ -1,9 +1,9 @@ #define PACKAGE "dosbox-x" #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" #define PACKAGE_NAME "dosbox-x" -#define PACKAGE_STRING "dosbox-x 2025.05.03" +#define PACKAGE_STRING "dosbox-x 2025.10.07" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2025.05.03" -#define VERSION "2025.05.03" +#define PACKAGE_VERSION "2025.10.07" +#define VERSION "2025.10.07" #define COPYRIGHT_YEAR "2025"