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:
285af7a
)
Makefile: Added more instructions to build library and Xestia Calendar
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sun, 25 Dec 2016 01:33:21 +0000
(
01:33
+0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sun, 25 Dec 2016 01:33:21 +0000
(
01:33
+0000)
source/Makefile
patch
|
blob
|
history
diff --git
a/source/Makefile
b/source/Makefile
index
ae5e05d
..
804bc5b
100644
(file)
--- a/
source/Makefile
+++ b/
source/Makefile
@@
-1,7
+1,10
@@
CPP=g++
STRIP=strip
CPP=g++
STRIP=strip
+BMCO_CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os -I./common -ggdb
CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os -I./common -ggdb
CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os -I./common -ggdb
-CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
+BMCO_CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2 -Llibraries -lCalendarDataStorage -lsqlite3
+CDSLIBS=-lsqlite3
MAKE=make
RM=rm
MAKE=make
RM=rm
@@
-13,41
+16,68
@@
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
+COMMONOBJS=common/monthviewgen.o common/file.o common/text.o \
+ common/uuid.o common/preferences.o common/dirs.o common/defaults.o
FORM_MAINOBJS=forms/main/frmMain.o
FORM_MAINOBJS=forms/main/frmMain.o
+FORM_PREFERENCESOBJS=forms/preferences/frmPreferences.o
WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
widgets/XCCalendarDayEntry.o widgets/XCCalendarMonthView.o \
widgets/XCCalendarMonthViewDayTitle.o \
widgets/XCCalendarManipulator.o \
WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
widgets/XCCalendarDayEntry.o widgets/XCCalendarMonthView.o \
widgets/XCCalendarMonthViewDayTitle.o \
widgets/XCCalendarManipulator.o \
- widgets/XCCalendarMonthSelect.o
+ widgets/XCCalendarMonthSelect.o \
+ widgets/XCCalendarList.o \
+ widgets/XCCalendarListAccountCtrl.o \
+ widgets/XCCalendarListCalendarCtrl.o
+CALENDARLISTOBJS=objects/calendarlist/CalendarList.o
+CALENDAROBJS=objects/calendarobject/CalendarObject-Save.o \
+ objects/calendarobject/CalendarObject.o
+CALENDAREVENTOBJS=objects/calendarevent/CalendarEvent-Save.o \
+ objects/calendarevent/CalendarEvent.o
+CDSOBJS=libraries/CalendarDataStorage/CalendarDataStorage.o
default:
$(MAKE) bitmaphelper
default:
$(MAKE) bitmaphelper
+ $(MAKE) calendardatastorage
$(MAKE) xestiacal
$(MAKE) xestiacal
-xestiacal: mainobjs form_mainobjs widgetsobjs commonobjs
+forms: form_mainobjs form_preferencesobjs
+
+xestiacal: mainobjs forms widgetsobjs commonobjs calendarlistobjs calendarobjs calendareventobjs
$(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) $(WIDGETSOBJS) \
$(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) $(WIDGETSOBJS) \
- $(COMMONOBJS) \
+ $(COMMONOBJS)
$(CALENDARLISTOBJS) $(CALENDAROBJS) $(CALENDAREVENTOBJS)
\
-o $(XCAL_OUT) $(CPPLIBS)
bitmaphelperobjs: $(BMCOOBJS)
bitmaphelper: bitmaphelperobjs
-o $(XCAL_OUT) $(CPPLIBS)
bitmaphelperobjs: $(BMCOOBJS)
bitmaphelper: bitmaphelperobjs
- $(CPP) $(
CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(
CPPLIBS)
+ $(CPP) $(
BMCO_CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(BMCO_
CPPLIBS)
$(BMCO_HELP) bitmaps/
clean:
find . -name "*.o" -type f -delete
$(BMCO_HELP) bitmaps/
clean:
find . -name "*.o" -type f -delete
+ find . -name "*.a" -type f -delete
$(RM) -f ./xestiacal
mainobjs: $(MAINOBJS)
form_mainobjs: $(FORM_MAINOBJS)
$(RM) -f ./xestiacal
mainobjs: $(MAINOBJS)
form_mainobjs: $(FORM_MAINOBJS)
+form_preferencesobjs: $(FORM_PREFERENCESOBJS)
+
widgetsobjs: $(WIDGETSOBJS)
commonobjs: $(COMMONOBJS)
widgetsobjs: $(WIDGETSOBJS)
commonobjs: $(COMMONOBJS)
+calendarlistobjs: $(CALENDARLISTOBJS)
+
+calendarobjs: $(CALENDAROBJS)
+
+calendareventobjs: $(CALENDAREVENTOBJS)
+
+calendardatastorage:
+ g++ -c -ggdb --std=c++11 libraries/CalendarDataStorage/CalendarDataStorage.cpp -o libraries/CalendarDataStorage/CalendarDataStorage.o -lsqlite3
+ ar rcs libraries/libCalendarDataStorage.a libraries/CalendarDataStorage/CalendarDataStorage.o
+
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