soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Update Makefile for WIN32 and copyright date

Browse Source
This commit is contained in:
Grégory Soutadé 2014-10-23 21:06:27 +02:00
parent 2cea83f22b
commit 899dc3db71
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -4,24 +4,20 @@ SHARE_DIR=$(DESTDIR)$(ROOT_DIR)"/share/kisscount/"
DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/" DOC_DIR=$(DESTDIR)$(ROOT_DIR)"/share/doc/kisscount/"
BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/" BIN_DIR=$(DESTDIR)$(ROOT_DIR)"/bin/"
CXX=$(HOST)g++
KISSCOUNT=kc
QT_PACKAGES="QtCore QtGui QtSql QtXml" QT_PACKAGES="QtCore QtGui QtSql QtXml"
CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)` CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)`
CXXFLAGS+=-Wall -Isrc -Isrc/win32 -ggdb -fPIC CXXFLAGS+=-Wall -Isrc -Isrc/win32
ifdef WIN32 ifdef WIN32
CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\"" CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
else else
CXXFLAGS+=-DRESSOURCES_ROOT="\"$(SHARE_DIR)\"" CXXFLAGS+=-DRESSOURCES_ROOT="\"$(SHARE_DIR)\"" -ggdb -fPIC
# For developpers # For developpers
#CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\"" #CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
endif endif
LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
ifndef WIN32
LDFLAGS+=-lofx
endif
CXX=$(HOST)g++
SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ') SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ')
OBJS=$(SOURCES:.cpp=.o) OBJS=$(SOURCES:.cpp=.o)
MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ') MOC_HEADERS=$(shell find src/view -name '*.hpp' -type f | tr '\n' ' ')
@ -38,7 +34,14 @@ KDCHART_MOCS=$(KDCHART_MOC_HEADERS:.h=.objs)
KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc) KDCHART_MOCS_OBJS=$(KDCHART_MOC_HEADERS:.h=.moc)
LDFLAGS+=lib/libkdchart.a LDFLAGS+=lib/libkdchart.a
all: mojito lib/libkdchart.a kc ifndef WIN32
LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
LDFLAGS+=-lofx
else
LDFLAGS+=lib/QtCore4.dll lib/QtGui4.dll lib/QtSql4.dll lib/QtXml4.dll
endif
all: mojito lib/libkdchart.a $(KISSCOUNT)
clean_all: clean clean_libkdchart clean_all: clean clean_libkdchart
@ -47,7 +50,7 @@ clean:
find src -type f -name '*~' -delete find src -type f -name '*~' -delete
find src -type f -name '*.moc' -delete find src -type f -name '*.moc' -delete
find src -type f -name '*.objs' -delete find src -type f -name '*.objs' -delete
rm -f kc rm -f $(KISSCOUNT)
%.o : %.cpp %.o : %.cpp
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
@ -63,7 +66,7 @@ clean:
mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS) mojito : $(MOCS_OBJS) $(KDCHART_MOCS_OBJS)
kc: $(MOCS) $(OBJS) $(KISSCOUNT): $(MOCS) $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
$(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui $(UI_CHARTSELECTOR): lib/libkdchart/src/KDChartDatasetSelector.ui
@ -92,7 +95,7 @@ endif
install: install:
mkdir -p $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR) mkdir -p $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR)
cp kc $(BIN_DIR) cp $(KISSCOUNT) $(BIN_DIR)
cp -rf ressources/* $(SHARE_DIR) cp -rf ressources/* $(SHARE_DIR)
rm -rf $(SHARE_DIR)/po/* # Only copy qm files rm -rf $(SHARE_DIR)/po/* # Only copy qm files
cp -rf ressources/po/*.qm $(SHARE_DIR)/po/ cp -rf ressources/po/*.qm $(SHARE_DIR)/po/

2
src/view/wxUI.cpp
View File

@ -314,7 +314,7 @@ void wxUI::ChangeUser()
void wxUI::OnButtonAbout() void wxUI::OnButtonAbout()
{ {
QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2012 Grégory Soutadé"); QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2014 Grégory Soutadé");
} }
void wxUI::OnButtonQuit() void wxUI::OnButtonQuit()