nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[oops] fix non Visual Studio builds 

* ...that got broken in ea817cbc2c
This commit is contained in:
Pete Batard 2014-10-31 20:32:42 +00:00
parent 131df52482
commit fbd0e00458
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libcdio/driver/.msvc/driver_sources
View File

@ -16,6 +16,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
SOURCES=disc.c \
ds.c \
logging.c \
memory.c \
read.c \
sector.c \
track.c \

2
src/libcdio/driver/Makefile.am
View File

@ -1,4 +1,4 @@
noinst_LIBRARIES = libdriver.a
libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
libdriver_a_SOURCES = disc.c ds.c logging.c memory.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I..

16
src/libcdio/driver/Makefile.in
View File

@ -54,9 +54,9 @@ libdriver_a_AR = $(AR) $(ARFLAGS)
libdriver_a_LIBADD =
am_libdriver_a_OBJECTS = libdriver_a-disc.$(OBJEXT) \
libdriver_a-ds.$(OBJEXT) libdriver_a-logging.$(OBJEXT) \
libdriver_a-read.$(OBJEXT) libdriver_a-sector.$(OBJEXT) \
libdriver_a-track.$(OBJEXT) libdriver_a-util.$(OBJEXT) \
libdriver_a-_cdio_stdio.$(OBJEXT) \
libdriver_a-memory.$(OBJEXT) libdriver_a-read.$(OBJEXT) \
libdriver_a-sector.$(OBJEXT) libdriver_a-track.$(OBJEXT) \
libdriver_a-util.$(OBJEXT) libdriver_a-_cdio_stdio.$(OBJEXT) \
libdriver_a-_cdio_stream.$(OBJEXT) libdriver_a-utf8.$(OBJEXT)
libdriver_a_OBJECTS = $(am_libdriver_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
@ -169,7 +169,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libdriver.a
libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
libdriver_a_SOURCES = disc.c ds.c logging.c memory.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I..
all: all-am
@ -252,6 +252,14 @@ libdriver_a-logging.obj: logging.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-logging.obj `if test -f 'logging.c'; then $(CYGPATH_W) 'logging.c'; else $(CYGPATH_W) '$(srcdir)/logging.c'; fi`
libdriver_a-memory.o: memory.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-memory.o `test -f 'memory.c' || echo '$(srcdir)/'`memory.c
libdriver_a-memory.obj: memory.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-memory.obj `if test -f 'memory.c'; then $(CYGPATH_W) 'memory.c'; else $(CYGPATH_W) '$(srcdir)/memory.c'; fi`
libdriver_a-read.o: read.c
$(AM_V_CC) @AM_BACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-read.o `test -f 'read.c' || echo '$(srcdir)/'`read.c

12
src/rufus.rc
View File

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 1.4.11.524"
CAPTION "Rufus 1.4.11.525"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -165,7 +165,7 @@ END
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 1.4.11.524"
CAPTION "Rufus 1.4.11.525"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -428,8 +428,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,11,524
PRODUCTVERSION 1,4,11,524
FILEVERSION 1,4,11,525
PRODUCTVERSION 1,4,11,525
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -446,13 +446,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.4.11.524"
VALUE "FileVersion", "1.4.11.525"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.4.11.524"
VALUE "ProductVersion", "1.4.11.525"
END
END
BLOCK "VarFileInfo"