From cb233e568461b5418631a6f51b93cfc9f6cacf1c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 10 Nov 2016 00:14:28 +0200 Subject: [PATCH] Fix case sensitiviness issues by using always lowercase This makes it possible to cross build in a machine with a case-sensitive file system. Tested in Arch Linux, where the following commands will successfully complete a build: % sudo pacman -S mingw-w64 # Only if it wasn't already installed % sh configure --host=i686-w64-mingw32 && make -j$(nproc --all) % file src/rufus.exe src/rufus.exe: PE32 executable (GUI) Intel 80386, for MS Windows Doing 64-bit builds seems to be working as well: % sh configure --host=x86_64-w64-mingw32 && make -j$(nproc --all) % file src/rufus.exe src/rufus.exe: PE32+ executable (GUI) x86-64, for MS Windows --- res/freedos/{COMMAND.COM => command.com} | Bin res/freedos/{DISPLAY.EXE => display.exe} | Bin res/freedos/{KERNEL.SYS => kernel.sys} | Bin res/freedos/{KEYB.EXE => keyb.exe} | Bin res/freedos/{KEYBOARD.SYS => keyboard.sys} | Bin res/freedos/{KEYBRD2.SYS => keybrd2.sys} | Bin res/freedos/{KEYBRD3.SYS => keybrd3.sys} | Bin res/freedos/{KEYBRD4.SYS => keybrd4.sys} | Bin src/format.h | 2 +- src/rufus.rc | 36 ++++++++++----------- 10 files changed, 19 insertions(+), 19 deletions(-) rename res/freedos/{COMMAND.COM => command.com} (100%) rename res/freedos/{DISPLAY.EXE => display.exe} (100%) rename res/freedos/{KERNEL.SYS => kernel.sys} (100%) rename res/freedos/{KEYB.EXE => keyb.exe} (100%) rename res/freedos/{KEYBOARD.SYS => keyboard.sys} (100%) rename res/freedos/{KEYBRD2.SYS => keybrd2.sys} (100%) rename res/freedos/{KEYBRD3.SYS => keybrd3.sys} (100%) rename res/freedos/{KEYBRD4.SYS => keybrd4.sys} (100%) diff --git a/res/freedos/COMMAND.COM b/res/freedos/command.com similarity index 100% rename from res/freedos/COMMAND.COM rename to res/freedos/command.com diff --git a/res/freedos/DISPLAY.EXE b/res/freedos/display.exe similarity index 100% rename from res/freedos/DISPLAY.EXE rename to res/freedos/display.exe diff --git a/res/freedos/KERNEL.SYS b/res/freedos/kernel.sys similarity index 100% rename from res/freedos/KERNEL.SYS rename to res/freedos/kernel.sys diff --git a/res/freedos/KEYB.EXE b/res/freedos/keyb.exe similarity index 100% rename from res/freedos/KEYB.EXE rename to res/freedos/keyb.exe diff --git a/res/freedos/KEYBOARD.SYS b/res/freedos/keyboard.sys similarity index 100% rename from res/freedos/KEYBOARD.SYS rename to res/freedos/keyboard.sys diff --git a/res/freedos/KEYBRD2.SYS b/res/freedos/keybrd2.sys similarity index 100% rename from res/freedos/KEYBRD2.SYS rename to res/freedos/keybrd2.sys diff --git a/res/freedos/KEYBRD3.SYS b/res/freedos/keybrd3.sys similarity index 100% rename from res/freedos/KEYBRD3.SYS rename to res/freedos/keybrd3.sys diff --git a/res/freedos/KEYBRD4.SYS b/res/freedos/keybrd4.sys similarity index 100% rename from res/freedos/KEYBRD4.SYS rename to res/freedos/keybrd4.sys diff --git a/src/format.h b/src/format.h index c66fb09b..bc32557c 100644 --- a/src/format.h +++ b/src/format.h @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include +#include #include // for MEDIA_TYPE #pragma once diff --git a/src/rufus.rc b/src/rufus.rc index 112b5aad..d6e32648 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -224,15 +224,15 @@ BEGIN "IDR_SL_MBOOT_C32 RCDATA ""../res/syslinux/mboot.c32""\r\n" "IDR_GR_GRUB_GRLDR_MBR RCDATA ""../res/grub/grldr.mbr""\r\n" "IDR_GR_GRUB2_CORE_IMG RCDATA ""../res/grub2/core.img""\r\n" - "IDR_FD_COMMAND_COM RCDATA ""../res/freedos/COMMAND.COM""\r\n" - "IDR_FD_KERNEL_SYS RCDATA ""../res/freedos/KERNEL.SYS""\r\n" - "IDR_FD_DISPLAY_EXE RCDATA ""../res/freedos/DISPLAY.EXE""\r\n" - "IDR_FD_KEYB_EXE RCDATA ""../res/freedos/KEYB.EXE""\r\n" - "IDR_FD_MODE_COM RCDATA ""../res/freedos/MODE.COM""\r\n" - "IDR_FD_KB1_SYS RCDATA ""../res/freedos/KEYBOARD.SYS""\r\n" - "IDR_FD_KB2_SYS RCDATA ""../res/freedos/KEYBRD2.SYS""\r\n" - "IDR_FD_KB3_SYS RCDATA ""../res/freedos/KEYBRD3.SYS""\r\n" - "IDR_FD_KB4_SYS RCDATA ""../res/freedos/KEYBRD4.SYS""\r\n" + "IDR_FD_COMMAND_COM RCDATA ""../res/freedos/command.com""\r\n" + "IDR_FD_KERNEL_SYS RCDATA ""../res/freedos/kernel.sys""\r\n" + "IDR_FD_DISPLAY_EXE RCDATA ""../res/freedos/display.exe""\r\n" + "IDR_FD_KEYB_EXE RCDATA ""../res/freedos/keyb.exe""\r\n" + "IDR_FD_MODE_COM RCDATA ""../res/freedos/mode.com""\r\n" + "IDR_FD_KB1_SYS RCDATA ""../res/freedos/keyboard.sys""\r\n" + "IDR_FD_KB2_SYS RCDATA ""../res/freedos/keybrd2.sys""\r\n" + "IDR_FD_KB3_SYS RCDATA ""../res/freedos/keybrd3.sys""\r\n" + "IDR_FD_KB4_SYS RCDATA ""../res/freedos/keybrd4.sys""\r\n" "IDR_FD_EGA1_CPX RCDATA ""../res/freedos/ega.cpx""\r\n" "IDR_FD_EGA2_CPX RCDATA ""../res/freedos/ega2.cpx""\r\n" "IDR_FD_EGA3_CPX RCDATA ""../res/freedos/ega3.cpx""\r\n" @@ -390,15 +390,15 @@ IDR_SL_LDLINUX_V6_SYS RCDATA "../res/syslinux/ldlinux_v6.sys" IDR_SL_MBOOT_C32 RCDATA "../res/syslinux/mboot.c32" IDR_GR_GRUB_GRLDR_MBR RCDATA "../res/grub/grldr.mbr" IDR_GR_GRUB2_CORE_IMG RCDATA "../res/grub2/core.img" -IDR_FD_COMMAND_COM RCDATA "../res/freedos/COMMAND.COM" -IDR_FD_KERNEL_SYS RCDATA "../res/freedos/KERNEL.SYS" -IDR_FD_DISPLAY_EXE RCDATA "../res/freedos/DISPLAY.EXE" -IDR_FD_KEYB_EXE RCDATA "../res/freedos/KEYB.EXE" -IDR_FD_MODE_COM RCDATA "../res/freedos/MODE.COM" -IDR_FD_KB1_SYS RCDATA "../res/freedos/KEYBOARD.SYS" -IDR_FD_KB2_SYS RCDATA "../res/freedos/KEYBRD2.SYS" -IDR_FD_KB3_SYS RCDATA "../res/freedos/KEYBRD3.SYS" -IDR_FD_KB4_SYS RCDATA "../res/freedos/KEYBRD4.SYS" +IDR_FD_COMMAND_COM RCDATA "../res/freedos/command.com" +IDR_FD_KERNEL_SYS RCDATA "../res/freedos/kernel.sys" +IDR_FD_DISPLAY_EXE RCDATA "../res/freedos/display.exe" +IDR_FD_KEYB_EXE RCDATA "../res/freedos/keyb.exe" +IDR_FD_MODE_COM RCDATA "../res/freedos/mode.com" +IDR_FD_KB1_SYS RCDATA "../res/freedos/keyboard.sys" +IDR_FD_KB2_SYS RCDATA "../res/freedos/keybrd2.sys" +IDR_FD_KB3_SYS RCDATA "../res/freedos/keybrd3.sys" +IDR_FD_KB4_SYS RCDATA "../res/freedos/keybrd4.sys" IDR_FD_EGA1_CPX RCDATA "../res/freedos/ega.cpx" IDR_FD_EGA2_CPX RCDATA "../res/freedos/ega2.cpx" IDR_FD_EGA3_CPX RCDATA "../res/freedos/ega3.cpx"