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

[mingw] Makefile improvements 

* also fixed removal of .tag in git post commit hook
This commit is contained in:
Pete Batard 2011-11-30 19:43:30 +00:00
parent 651cdcaa65
commit 70a5116bb7
3 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Makefile
View File

@ -1,23 +1,46 @@
TARGETNAME=rufus
#
# This file is part of the Rufus project.
#
# Copyright (c) 2011 Pete Batard <pbatard@akeo.ie>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
CC = gcc
RC = windres
STRIP = strip
CFLAGS = -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow -O2 -Wl,--subsystem,windows -DWINVER=0x501 -D_WIN32_IE=0x501
LIBS = -lsetupapi -lole32 -lgdi32
OBJECTS = fat12.o fat16.o fat32.o br.o file.o msdos.o stdlg.o rufus.o
TARGET = rufus
RUFUS_SRC = rufus.c stdlg.c msdos.c file.c br.c fat12.c fat16.c fat32.c
CC = gcc
RC = windres
STRIP = strip
CFLAGS = -DWINVER=0x501 -D_WIN32_IE=0x501 -I./inc -std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow
LDFLAGS = -O2 -Wall -Wl,--subsystem,windows
LIBS = -lsetupapi -lole32 -lgdi32
.PHONY: all clean
.PHONY: all clean
all: $(TARGETNAME)
all: $(TARGET)
$(TARGETNAME): $(RUFUS_SRC) $(TARGETNAME)_rc.o
$(TARGET): $(OBJECTS) $(TARGET)_rc.o
@echo "[CCLD] $@"
@$(CC) -I./inc -o $@ $(CFLAGS) $^ $(TARGETNAME)_rc.o $(LIBS)
@$(STRIP) $(TARGETNAME).exe
@$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(TARGET)_rc.o $(LIBS)
@$(STRIP) $(TARGET).exe
$(TARGETNAME)_rc.o: $(TARGETNAME).rc
%.o: %.c
@echo "[CC] $@"
@$(CC) -c -o $*.o $(CFLAGS) $<
%_rc.o: %.rc
@echo "[RC] $@"
@$(RC) -i $< -o $@

3
_post-commit.sh
View File

@ -9,5 +9,6 @@
type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; }
TAGVER=`cat .tag`
TAGVER=`cat ./.tag`
git tag "#$TAGVER"
rm ./.tag

12
rufus.rc
View File

@ -63,7 +63,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""https://github.com/pbatard/rufus/wiki/Rufus"">https://github.com/pbatard/rufus</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9
LTEXT "Version 1.0.0 (Build 52)",IDC_STATIC,46,19,78,8
LTEXT "Version 1.0.0 (Build 53)",IDC_STATIC,46,19,78,8
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
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@ -162,8 +162,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,52
PRODUCTVERSION 1,0,0,52
FILEVERSION 1,0,0,53
PRODUCTVERSION 1,0,0,53
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -180,13 +180,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.0.0.52"
VALUE "FileVersion", "1.0.0.53"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.0.0.52"
VALUE "ProductVersion", "1.0.0.53"
END
END
BLOCK "VarFileInfo"
@ -212,7 +212,7 @@ IDI_ICON ICON "rufus.ico"
STRINGTABLE
BEGIN
IDS_VERSION "Rufus v1.0.0.52"
IDS_VERSION "Rufus v1.0.0.53"
END
#endif // English resources