mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-17 16:44:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

[mingw] added --with-freedos to configure

Browse source 
* default is enabled (=> add --without-freedos to disable)
* also update the release process as a result
* also update version to rufus next
* also fixed FreeDOS embedded files lost when RC is edited in Visual Studio
This commit is contained in:
Pete Batard 2012-01-06 16:46:27 +00:00
parent 3187f71933
commit 55e6cd8023
9 changed files with 115 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile.am
View file

@ -4,11 +4,12 @@ TARGET = rufus
# This step produces the UPX compressed and signed releases that are made available for public download # This step produces the UPX compressed and signed releases that are made available for public download
release: all release: all
@mv src/$(TARGET)$(EXEEXT) . @mv src/$(TARGET)$(EXEEXT) .
@mv src/$(TARGET)_fd$(EXEEXT) .
@$(STRIP) $(TARGET)$(EXEEXT) @$(STRIP) $(TARGET)$(EXEEXT)
@$(STRIP) $(TARGET)_fd$(EXEEXT)
@upx $(TARGET)$(EXEEXT) @upx $(TARGET)$(EXEEXT)
@upx $(TARGET)_fd$(EXEEXT) @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT)
@cmd.exe /k _sign.cmd $(TARGET)$(EXEEXT) $(TARGET)_fd$(EXEEXT) # Don't want to enter a password twice => only sign when we have both release files
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) @if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \
@mv $(TARGET)_fd$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT) if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \
cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \
fi; \
fi

15
Makefile.in
View file

@ -71,6 +71,7 @@ AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@ AM_CFLAGS = @AM_CFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@ AM_LDFLAGS = @AM_LDFLAGS@
AM_RCFLAGS = @AM_RCFLAGS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
@ -84,6 +85,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXESUFFIX = @EXESUFFIX@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -444,14 +446,15 @@ uninstall-am:
# This step produces the UPX compressed and signed releases that are made available for public download # This step produces the UPX compressed and signed releases that are made available for public download
release: all release: all
@mv src/$(TARGET)$(EXEEXT) . @mv src/$(TARGET)$(EXEEXT) .
@mv src/$(TARGET)_fd$(EXEEXT) .
@$(STRIP) $(TARGET)$(EXEEXT) @$(STRIP) $(TARGET)$(EXEEXT)
@$(STRIP) $(TARGET)_fd$(EXEEXT)
@upx $(TARGET)$(EXEEXT) @upx $(TARGET)$(EXEEXT)
@upx $(TARGET)_fd$(EXEEXT) @mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXESUFFIX)$(EXEEXT)
@cmd.exe /k _sign.cmd $(TARGET)$(EXEEXT) $(TARGET)_fd$(EXEEXT) # Don't want to enter a password twice => only sign when we have both release files
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT) @if [ -f $(TARGET)_v$(VERSION)f$(EXEEXT) ]; then \
@mv $(TARGET)_fd$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT) if [ -f $(TARGET)_v$(VERSION)$(EXEEXT) ]; then \
cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT) $(TARGET)_v$(VERSION)f$(EXEEXT); \
fi; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

10
_release.sh Normal file
View file

@ -0,0 +1,10 @@
#!/bin/sh
rm -f rufus*.exe
./configure --without-freedos
make clean
make release -j2
./configure --with-freedos
# The only difference between FreeDOS and non FreeDOS is with the RC
# => instead of invoking 'make clean, just remove the RC object
rm src/rufus_rc.o
make release -j2

1
_sign.cmd
View file

@ -1,5 +1,4 @@
:retry :retry
@set password=
@set /p password=Please enter PFX password: @set /p password=Please enter PFX password:
@E:\WinDDK\7600.16385.0\bin\amd64\signtool sign /v /f D:\Secured\akeo\pbatard.p12 /p %password% /t http://time.certum.pl %1 %2 %3 %4 @E:\WinDDK\7600.16385.0\bin\amd64\signtool sign /v /f D:\Secured\akeo\pbatard.p12 /p %password% /t http://time.certum.pl %1 %2 %3 %4
@if ERRORLEVEL 1 goto retry @if ERRORLEVEL 1 goto retry

57
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for rufus 1.0.6. # Generated by GNU Autoconf 2.68 for rufus 1.0.7.
# #
# Report bugs to <https://github.com/pbatard/rufus/issues>. # Report bugs to <https://github.com/pbatard/rufus/issues>.
# #
@ -559,16 +559,18 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='rufus' PACKAGE_NAME='rufus'
PACKAGE_TARNAME='rufus' PACKAGE_TARNAME='rufus'
PACKAGE_VERSION='1.0.6' PACKAGE_VERSION='1.0.7'
PACKAGE_STRING='rufus 1.0.6' PACKAGE_STRING='rufus 1.0.7'
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
PACKAGE_URL='https://github.com/pbatard/rufus' PACKAGE_URL='http://rufus.akeo.ie'
ac_unique_file="src/rufus.c" ac_unique_file="src/rufus.c"
ac_subst_vars='am__EXEEXT_FALSE ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIBOBJS LIBOBJS
EXESUFFIX
AM_RCFLAGS
AM_LDFLAGS AM_LDFLAGS
AM_CFLAGS AM_CFLAGS
VISIBILITY_CFLAGS VISIBILITY_CFLAGS
@ -648,6 +650,7 @@ ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
enable_silent_rules enable_silent_rules
with_freedos
enable_debug enable_debug
' '
ac_precious_vars='build_alias ac_precious_vars='build_alias
@ -1200,7 +1203,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures rufus 1.0.6 to adapt to many kinds of systems. \`configure' configures rufus 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1266,7 +1269,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of rufus 1.0.6:";; short | recursive ) echo "Configuration of rufus 1.0.7:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1276,7 +1279,12 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: `make V=1') --enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0') --disable-silent-rules verbose build output (undo: `make V=0')
--enable-debug keep debug symbols for gdb (default y) --enable-debug keep debug symbols for gdb (default=yes)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-freedos embed FreeDOS support (default=yes)
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -1291,7 +1299,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
Report bugs to <https://github.com/pbatard/rufus/issues>. Report bugs to <https://github.com/pbatard/rufus/issues>.
rufus home page: <https://github.com/pbatard/rufus>. rufus home page: <http://rufus.akeo.ie>.
_ACEOF _ACEOF
ac_status=$? ac_status=$?
fi fi
@ -1354,7 +1362,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
rufus configure 1.0.6 rufus configure 1.0.7
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
@ -1409,7 +1417,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by rufus $as_me 1.0.6, which was It was created by rufus $as_me 1.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@ $ $0 $@
@ -2224,7 +2232,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='rufus' PACKAGE='rufus'
VERSION='1.0.6' VERSION='1.0.7'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -3365,13 +3373,18 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h
AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501"
AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined"
# Debug logging
#AC_ARG_ENABLE([log], [AS_HELP_STRING([--enable-log], [enable logging (default y)])], # Check whether --with-freedos was given.
# [log_enabled=$enableval], if test "${with_freedos+set}" = set; then :
# [log_enabled='yes']) withval=$with_freedos;
#if test "x$log_enabled" != "xno"; then else
# AC_DEFINE([RUFUS_DEBUG], [1], [Debug logging]) with_freedos=yes
#fi fi
if test "x$with_freedos" != "xno" ; then
AM_RCFLAGS="-DWITH_FREEDOS"
EXESUFFIX="f"
fi
# Debug symbols # Debug symbols
# Check whether --enable-debug was given. # Check whether --enable-debug was given.
@ -3416,6 +3429,8 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files src/Makefile" ac_config_files="$ac_config_files src/Makefile"
@ -3982,7 +3997,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by rufus $as_me 1.0.6, which was This file was extended by rufus $as_me 1.0.7, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4030,13 +4045,13 @@ Configuration files:
$config_files $config_files
Report bugs to <https://github.com/pbatard/rufus/issues>. Report bugs to <https://github.com/pbatard/rufus/issues>.
rufus home page: <https://github.com/pbatard/rufus>." rufus home page: <http://rufus.akeo.ie>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
rufus config.status 1.0.6 rufus config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

22
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT([rufus], [1.0.6], [https://github.com/pbatard/rufus/issues], [rufus], [https://github.com/pbatard/rufus]) AC_INIT([rufus], [1.0.7], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_SRCDIR([src/rufus.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -36,16 +36,18 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions])
AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501"
AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined"
# Debug logging AC_ARG_WITH([freedos],
#AC_ARG_ENABLE([log], [AS_HELP_STRING([--enable-log], [enable logging (default y)])], [AS_HELP_STRING([--with-freedos],
# [log_enabled=$enableval], [embed FreeDOS support (default=yes)])],
# [log_enabled='yes']) [],
#if test "x$log_enabled" != "xno"; then [with_freedos=yes])
# AC_DEFINE([RUFUS_DEBUG], [1], [Debug logging]) if test "x$with_freedos" != "xno" ; then
#fi AM_RCFLAGS="-DWITH_FREEDOS"
EXESUFFIX="f"
fi
# Debug symbols # Debug symbols
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [keep debug symbols for gdb (default y)]), AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [keep debug symbols for gdb (default=yes)]),
[debug_enabled=$enableval], [debug_enabled=$enableval],
[debug_enabled='yes']) [debug_enabled='yes'])
if test "x$debug_enabled" = "xyes" ; then if test "x$debug_enabled" = "xyes" ; then
@ -67,6 +69,8 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot
AC_SUBST([VISIBILITY_CFLAGS]) AC_SUBST([VISIBILITY_CFLAGS])
AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_LDFLAGS]) AC_SUBST([AM_LDFLAGS])
AC_SUBST([AM_RCFLAGS])
AC_SUBST([EXESUFFIX])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/Makefile])

17
src/Makefile.am
View file

@ -1,24 +1,13 @@
#INCLUDES = -I$(top_srcdir) noinst_PROGRAMS = rufus
noinst_PROGRAMS = rufus rufus_fd
pkg_v_rc = $(pkg_v_rc_$(V)) pkg_v_rc = $(pkg_v_rc_$(V))
pkg_v_rc_ = $(pkg_v_rc_$(AM_DEFAULT_VERBOSITY)) pkg_v_rc_ = $(pkg_v_rc_$(AM_DEFAULT_VERBOSITY))
pkg_v_rc_0 = @echo " RC $@"; pkg_v_rc_0 = @echo " RC $@";
# NB: There's a good reason we don't do something more elegant than copy/paste for _fd %_rc.o: %.rc
rufus_rc.o: rufus.rc $(pkg_v_rc)$(WINDRES) $(AM_RCFLAGS) -i $< -o $@
$(pkg_v_rc)$(WINDRES) -i $< -o $@
rufus_fd_rc.o: rufus.rc
$(pkg_v_rc)$(WINDRES) -DWITH_FREEDOS -i $< -o $@
rufus_SOURCES = fat12.c fat16.c fat32.c partition_info.c br.c file.c drive.c dos.c dos_locale.c badblocks.c format.c stdio.c stdlg.c rufus.c rufus_SOURCES = fat12.c fat16.c fat32.c partition_info.c br.c file.c drive.c dos.c dos_locale.c badblocks.c format.c stdio.c stdlg.c rufus.c
rufus_CFLAGS = -I./inc $(AM_CFLAGS) rufus_CFLAGS = -I./inc $(AM_CFLAGS)
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32 rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32
rufus_fd_SOURCES = fat12.c fat16.c fat32.c partition_info.c br.c file.c drive.c dos.c dos_locale.c badblocks.c format.c stdio.c stdlg.c rufus.c
rufus_fd_CFLAGS = -I./inc $(AM_CFLAGS)
rufus_fd_LDFLAGS = $(AM_LDFLAGS) -mwindows
rufus_fd_LDADD = rufus_fd_rc.o -lsetupapi -lole32 -lgdi32

147
src/Makefile.in
View file

@ -15,8 +15,6 @@
@SET_MAKE@ @SET_MAKE@
#INCLUDES = -I$(top_srcdir)
VPATH = @srcdir@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
@ -34,7 +32,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
noinst_PROGRAMS = rufus$(EXEEXT) rufus_fd$(EXEEXT) noinst_PROGRAMS = rufus$(EXEEXT)
subdir = src subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -56,18 +54,6 @@ rufus_OBJECTS = $(am_rufus_OBJECTS)
rufus_DEPENDENCIES = rufus_rc.o rufus_DEPENDENCIES = rufus_rc.o
rufus_LINK = $(CCLD) $(rufus_CFLAGS) $(CFLAGS) $(rufus_LDFLAGS) \ rufus_LINK = $(CCLD) $(rufus_CFLAGS) $(CFLAGS) $(rufus_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
am_rufus_fd_OBJECTS = rufus_fd-fat12.$(OBJEXT) \
rufus_fd-fat16.$(OBJEXT) rufus_fd-fat32.$(OBJEXT) \
rufus_fd-partition_info.$(OBJEXT) rufus_fd-br.$(OBJEXT) \
rufus_fd-file.$(OBJEXT) rufus_fd-drive.$(OBJEXT) \
rufus_fd-dos.$(OBJEXT) rufus_fd-dos_locale.$(OBJEXT) \
rufus_fd-badblocks.$(OBJEXT) rufus_fd-format.$(OBJEXT) \
rufus_fd-stdio.$(OBJEXT) rufus_fd-stdlg.$(OBJEXT) \
rufus_fd-rufus.$(OBJEXT)
rufus_fd_OBJECTS = $(am_rufus_fd_OBJECTS)
rufus_fd_DEPENDENCIES = rufus_fd_rc.o
rufus_fd_LINK = $(CCLD) $(rufus_fd_CFLAGS) $(CFLAGS) \
$(rufus_fd_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = depcomp =
am__depfiles_maybe = am__depfiles_maybe =
@ -90,7 +76,7 @@ am__v_CCLD_0 = @echo " CCLD " $@;
AM_V_GEN = $(am__v_GEN_$(V)) AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@; am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(rufus_SOURCES) $(rufus_fd_SOURCES) SOURCES = $(rufus_SOURCES)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
@ -98,6 +84,7 @@ AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@ AM_CFLAGS = @AM_CFLAGS@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@ AM_LDFLAGS = @AM_LDFLAGS@
AM_RCFLAGS = @AM_RCFLAGS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
@ -111,6 +98,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
EXESUFFIX = @EXESUFFIX@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -185,10 +173,6 @@ rufus_SOURCES = fat12.c fat16.c fat32.c partition_info.c br.c file.c drive.c dos
rufus_CFLAGS = -I./inc $(AM_CFLAGS) rufus_CFLAGS = -I./inc $(AM_CFLAGS)
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32 rufus_LDADD = rufus_rc.o -lsetupapi -lole32 -lgdi32
rufus_fd_SOURCES = fat12.c fat16.c fat32.c partition_info.c br.c file.c drive.c dos.c dos_locale.c badblocks.c format.c stdio.c stdlg.c rufus.c
rufus_fd_CFLAGS = -I./inc $(AM_CFLAGS)
rufus_fd_LDFLAGS = $(AM_LDFLAGS) -mwindows
rufus_fd_LDADD = rufus_fd_rc.o -lsetupapi -lole32 -lgdi32
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -229,9 +213,6 @@ clean-noinstPROGRAMS:
rufus$(EXEEXT): $(rufus_OBJECTS) $(rufus_DEPENDENCIES) rufus$(EXEEXT): $(rufus_OBJECTS) $(rufus_DEPENDENCIES)
@rm -f rufus$(EXEEXT) @rm -f rufus$(EXEEXT)
$(AM_V_CCLD)$(rufus_LINK) $(rufus_OBJECTS) $(rufus_LDADD) $(LIBS) $(AM_V_CCLD)$(rufus_LINK) $(rufus_OBJECTS) $(rufus_LDADD) $(LIBS)
rufus_fd$(EXEEXT): $(rufus_fd_OBJECTS) $(rufus_fd_DEPENDENCIES)
@rm -f rufus_fd$(EXEEXT)
$(AM_V_CCLD)$(rufus_fd_LINK) $(rufus_fd_OBJECTS) $(rufus_fd_LDADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -359,118 +340,6 @@ rufus-rufus.obj: rufus.c
$(AM_V_CC) @AM_BACKSLASH@ $(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-rufus.obj `if test -f 'rufus.c'; then $(CYGPATH_W) 'rufus.c'; else $(CYGPATH_W) '$(srcdir)/rufus.c'; fi` $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_CFLAGS) $(CFLAGS) -c -o rufus-rufus.obj `if test -f 'rufus.c'; then $(CYGPATH_W) 'rufus.c'; else $(CYGPATH_W) '$(srcdir)/rufus.c'; fi`
rufus_fd-fat12.o: fat12.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat12.o `test -f 'fat12.c' || echo '$(srcdir)/'`fat12.c
rufus_fd-fat12.obj: fat12.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat12.obj `if test -f 'fat12.c'; then $(CYGPATH_W) 'fat12.c'; else $(CYGPATH_W) '$(srcdir)/fat12.c'; fi`
rufus_fd-fat16.o: fat16.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat16.o `test -f 'fat16.c' || echo '$(srcdir)/'`fat16.c
rufus_fd-fat16.obj: fat16.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat16.obj `if test -f 'fat16.c'; then $(CYGPATH_W) 'fat16.c'; else $(CYGPATH_W) '$(srcdir)/fat16.c'; fi`
rufus_fd-fat32.o: fat32.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat32.o `test -f 'fat32.c' || echo '$(srcdir)/'`fat32.c
rufus_fd-fat32.obj: fat32.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-fat32.obj `if test -f 'fat32.c'; then $(CYGPATH_W) 'fat32.c'; else $(CYGPATH_W) '$(srcdir)/fat32.c'; fi`
rufus_fd-partition_info.o: partition_info.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-partition_info.o `test -f 'partition_info.c' || echo '$(srcdir)/'`partition_info.c
rufus_fd-partition_info.obj: partition_info.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-partition_info.obj `if test -f 'partition_info.c'; then $(CYGPATH_W) 'partition_info.c'; else $(CYGPATH_W) '$(srcdir)/partition_info.c'; fi`
rufus_fd-br.o: br.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-br.o `test -f 'br.c' || echo '$(srcdir)/'`br.c
rufus_fd-br.obj: br.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-br.obj `if test -f 'br.c'; then $(CYGPATH_W) 'br.c'; else $(CYGPATH_W) '$(srcdir)/br.c'; fi`
rufus_fd-file.o: file.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-file.o `test -f 'file.c' || echo '$(srcdir)/'`file.c
rufus_fd-file.obj: file.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-file.obj `if test -f 'file.c'; then $(CYGPATH_W) 'file.c'; else $(CYGPATH_W) '$(srcdir)/file.c'; fi`
rufus_fd-drive.o: drive.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-drive.o `test -f 'drive.c' || echo '$(srcdir)/'`drive.c
rufus_fd-drive.obj: drive.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-drive.obj `if test -f 'drive.c'; then $(CYGPATH_W) 'drive.c'; else $(CYGPATH_W) '$(srcdir)/drive.c'; fi`
rufus_fd-dos.o: dos.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-dos.o `test -f 'dos.c' || echo '$(srcdir)/'`dos.c
rufus_fd-dos.obj: dos.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-dos.obj `if test -f 'dos.c'; then $(CYGPATH_W) 'dos.c'; else $(CYGPATH_W) '$(srcdir)/dos.c'; fi`
rufus_fd-dos_locale.o: dos_locale.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-dos_locale.o `test -f 'dos_locale.c' || echo '$(srcdir)/'`dos_locale.c
rufus_fd-dos_locale.obj: dos_locale.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-dos_locale.obj `if test -f 'dos_locale.c'; then $(CYGPATH_W) 'dos_locale.c'; else $(CYGPATH_W) '$(srcdir)/dos_locale.c'; fi`
rufus_fd-badblocks.o: badblocks.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-badblocks.o `test -f 'badblocks.c' || echo '$(srcdir)/'`badblocks.c
rufus_fd-badblocks.obj: badblocks.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-badblocks.obj `if test -f 'badblocks.c'; then $(CYGPATH_W) 'badblocks.c'; else $(CYGPATH_W) '$(srcdir)/badblocks.c'; fi`
rufus_fd-format.o: format.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-format.o `test -f 'format.c' || echo '$(srcdir)/'`format.c
rufus_fd-format.obj: format.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-format.obj `if test -f 'format.c'; then $(CYGPATH_W) 'format.c'; else $(CYGPATH_W) '$(srcdir)/format.c'; fi`
rufus_fd-stdio.o: stdio.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-stdio.o `test -f 'stdio.c' || echo '$(srcdir)/'`stdio.c
rufus_fd-stdio.obj: stdio.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-stdio.obj `if test -f 'stdio.c'; then $(CYGPATH_W) 'stdio.c'; else $(CYGPATH_W) '$(srcdir)/stdio.c'; fi`
rufus_fd-stdlg.o: stdlg.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-stdlg.o `test -f 'stdlg.c' || echo '$(srcdir)/'`stdlg.c
rufus_fd-stdlg.obj: stdlg.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-stdlg.obj `if test -f 'stdlg.c'; then $(CYGPATH_W) 'stdlg.c'; else $(CYGPATH_W) '$(srcdir)/stdlg.c'; fi`
rufus_fd-rufus.o: rufus.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-rufus.o `test -f 'rufus.c' || echo '$(srcdir)/'`rufus.c
rufus_fd-rufus.obj: rufus.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rufus_fd_CFLAGS) $(CFLAGS) -c -o rufus_fd-rufus.obj `if test -f 'rufus.c'; then $(CYGPATH_W) 'rufus.c'; else $(CYGPATH_W) '$(srcdir)/rufus.c'; fi`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
@ -633,12 +502,8 @@ uninstall-am:
ps ps-am tags uninstall uninstall-am ps ps-am tags uninstall uninstall-am
# NB: There's a good reason we don't do something more elegant than copy/paste for _fd %_rc.o: %.rc
rufus_rc.o: rufus.rc $(pkg_v_rc)$(WINDRES) $(AM_RCFLAGS) -i $< -o $@
$(pkg_v_rc)$(WINDRES) -i $< -o $@
rufus_fd_rc.o: rufus.rc
$(pkg_v_rc)$(WINDRES) -DWITH_FREEDOS -i $< -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.

37
src/rufus.rc
View file

@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 278 IDD_DIALOG DIALOGEX 12, 12, 206, 278
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.0.6.109" CAPTION "Rufus v1.0.7.110"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 DEFPUSHBUTTON "Start",IDC_START,94,236,50,14
@ -65,7 +65,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL, CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9 "SysLink",WS_TABSTOP,46,47,114,9
LTEXT "Version 1.0.6 (Build 109)",IDC_STATIC,46,19,78,8 LTEXT "Version 1.0.7 (Build 110)",IDC_STATIC,46,19,78,8
PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@ -123,6 +123,31 @@ BEGIN
"#if defined(WITH_FREEDOS)\r\n" "#if defined(WITH_FREEDOS)\r\n"
"IDR_FD_COMMAND_COM RCDATA ""../freedos/COMMAND.COM""\r\n" "IDR_FD_COMMAND_COM RCDATA ""../freedos/COMMAND.COM""\r\n"
"IDR_FD_KERNEL_SYS RCDATA ""../freedos/KERNEL.SYS""\r\n" "IDR_FD_KERNEL_SYS RCDATA ""../freedos/KERNEL.SYS""\r\n"
"IDR_FD_DISPLAY_EXE RCDATA ""../freedos/DISPLAY.EXE""\r\n"
"IDR_FD_KEYB_EXE RCDATA ""../freedos/KEYB.EXE""\r\n"
"IDR_FD_MODE_COM RCDATA ""../freedos/MODE.COM""\r\n"
"IDR_FD_KB1_SYS RCDATA ""../freedos/KEYBOARD.SYS""\r\n"
"IDR_FD_KB2_SYS RCDATA ""../freedos/KEYBRD2.SYS""\r\n"
"IDR_FD_KB3_SYS RCDATA ""../freedos/KEYBRD3.SYS""\r\n"
"IDR_FD_KB4_SYS RCDATA ""../freedos/KEYBRD4.SYS""\r\n"
"IDR_FD_EGA1_CPX RCDATA ""../freedos/ega.cpx""\r\n"
"IDR_FD_EGA2_CPX RCDATA ""../freedos/ega2.cpx""\r\n"
"IDR_FD_EGA3_CPX RCDATA ""../freedos/ega3.cpx""\r\n"
"IDR_FD_EGA4_CPX RCDATA ""../freedos/ega4.cpx""\r\n"
"IDR_FD_EGA5_CPX RCDATA ""../freedos/ega5.cpx""\r\n"
"IDR_FD_EGA6_CPX RCDATA ""../freedos/ega6.cpx""\r\n"
"IDR_FD_EGA7_CPX RCDATA ""../freedos/ega7.cpx""\r\n"
"IDR_FD_EGA8_CPX RCDATA ""../freedos/ega8.cpx""\r\n"
"IDR_FD_EGA9_CPX RCDATA ""../freedos/ega9.cpx""\r\n"
"IDR_FD_EGA10_CPX RCDATA ""../freedos/ega10.cpx""\r\n"
"IDR_FD_EGA11_CPX RCDATA ""../freedos/ega11.cpx""\r\n"
"IDR_FD_EGA12_CPX RCDATA ""../freedos/ega12.cpx""\r\n"
"IDR_FD_EGA13_CPX RCDATA ""../freedos/ega13.cpx""\r\n"
"IDR_FD_EGA14_CPX RCDATA ""../freedos/ega14.cpx""\r\n"
"IDR_FD_EGA15_CPX RCDATA ""../freedos/ega15.cpx""\r\n"
"IDR_FD_EGA16_CPX RCDATA ""../freedos/ega16.cpx""\r\n"
"IDR_FD_EGA17_CPX RCDATA ""../freedos/ega17.cpx""\r\n"
"IDR_FD_EGA18_CPX RCDATA ""../freedos/ega18.cpx""\r\n"
"#endif\r\n" "#endif\r\n"
"\r\n" "\r\n"
"// Must reference a manifest for visual styles and elevation\r\n" "// Must reference a manifest for visual styles and elevation\r\n"
@ -170,8 +195,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,6,109 FILEVERSION 1,0,7,110
PRODUCTVERSION 1,0,6,109 PRODUCTVERSION 1,0,7,110
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -188,13 +213,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "akeo.ie" VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.0.6.109" VALUE "FileVersion", "1.0.7.110"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.0.6.109" VALUE "ProductVersion", "1.0.7.110"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"