Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiacalendar
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b11388
)
Updated Makefile
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 26 Nov 2016 22:47:12 +0000
(22:47 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 26 Nov 2016 22:47:12 +0000
(22:47 +0000)
source/Makefile
patch
|
blob
|
history
diff --git
a/source/Makefile
b/source/Makefile
index
42e9c68
..
ae5e05d
100644
(file)
--- a/
source/Makefile
+++ b/
source/Makefile
@@
-1,6
+1,6
@@
CPP=g++
STRIP=strip
CPP=g++
STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os
-I./common -ggdb
CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
MAKE=make
RM=rm
CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
MAKE=make
RM=rm
@@
-13,14
+13,21
@@
BMCO_DIR=../bitmaps
MAINOBJS=main.o AppXestiaCalendar.o
BMCOOBJS=tools/bitmapcode.o
MAINOBJS=main.o AppXestiaCalendar.o
BMCOOBJS=tools/bitmapcode.o
+COMMONOBJS=common/monthviewgen.o
FORM_MAINOBJS=forms/main/frmMain.o
FORM_MAINOBJS=forms/main/frmMain.o
+WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
+ widgets/XCCalendarDayEntry.o widgets/XCCalendarMonthView.o \
+ widgets/XCCalendarMonthViewDayTitle.o \
+ widgets/XCCalendarManipulator.o \
+ widgets/XCCalendarMonthSelect.o
default:
$(MAKE) bitmaphelper
$(MAKE) xestiacal
default:
$(MAKE) bitmaphelper
$(MAKE) xestiacal
-xestiacal: mainobjs form_mainobjs
- $(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) \
+xestiacal: mainobjs form_mainobjs widgetsobjs commonobjs
+ $(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) $(WIDGETSOBJS) \
+ $(COMMONOBJS) \
-o $(XCAL_OUT) $(CPPLIBS)
bitmaphelperobjs: $(BMCOOBJS)
-o $(XCAL_OUT) $(CPPLIBS)
bitmaphelperobjs: $(BMCOOBJS)
@@
-30,12
+37,17
@@
bitmaphelper: bitmaphelperobjs
$(BMCO_HELP) bitmaps/
clean:
$(BMCO_HELP) bitmaps/
clean:
- $(RM) -rf *.o
+ find . -name "*.o" -type f -delete
+ $(RM) -f ./xestiacal
mainobjs: $(MAINOBJS)
form_mainobjs: $(FORM_MAINOBJS)
mainobjs: $(MAINOBJS)
form_mainobjs: $(FORM_MAINOBJS)
+
+widgetsobjs: $(WIDGETSOBJS)
+commonobjs: $(COMMONOBJS)
+
test:
cd tests
g++ `xml2-config --cflags --libs` -ggdb --std=c++11 -lcurl -lgtest -pthread xestiacalendar_test.cpp xestiacalendar_testcommon.cpp ../objects/calendarevent/CalendarEvent.cpp ../objects/calendartask/CalendarTask.cpp ../objects/calendarjournal/CalendarJournal.cpp ../objects/calendarfreebusy/CalendarFreeBusy.cpp ../objects/calendartimezone/CalendarTimezone.cpp ../objects/calendarobject/CalendarObject.cpp ../common/file.cpp ../common/text.cpp ../objects/CalDAV/CalDAV.cpp ../objects/CalDAV/CalDAV-XMLProcessing.cpp -o xestiacalendar_test
test:
cd tests
g++ `xml2-config --cflags --libs` -ggdb --std=c++11 -lcurl -lgtest -pthread xestiacalendar_test.cpp xestiacalendar_testcommon.cpp ../objects/calendarevent/CalendarEvent.cpp ../objects/calendartask/CalendarTask.cpp ../objects/calendarjournal/CalendarJournal.cpp ../objects/calendarfreebusy/CalendarFreeBusy.cpp ../objects/calendartimezone/CalendarTimezone.cpp ../objects/calendarobject/CalendarObject.cpp ../common/file.cpp ../common/text.cpp ../objects/CalDAV/CalDAV.cpp ../objects/CalDAV/CalDAV-XMLProcessing.cpp -o xestiacalendar_test
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy