X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2FMakefile;h=7634f0387ccc5480f1632e884bf9a561aaf1777a;hp=66e5d9aeea9283009455fc1c58f53270b8be05f2;hb=0c16b6458c0fdc03b94288c17d7a685b95f122fc;hpb=0ab57926e3065ce179d2672999ba7df14c0bc4f9

diff --git a/source/Makefile b/source/Makefile
index 66e5d9a..7634f03 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,7 +1,7 @@
 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
+BMCO_CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -I./common -ggdb
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -I./common -ggdb
 BMCO_CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
 CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2 -Llibraries -lCalendarDataStorage -lsqlite3
 CDSLIBS=-lsqlite3
@@ -18,9 +18,13 @@ MAINOBJS=main.o AppXestiaCalendar.o
 BMCOOBJS=tools/bitmapcode.o
 COMMONOBJS=common/monthviewgen.o common/file.o common/text.o \
  common/uuid.o common/preferences.o common/dirs.o common/defaults.o \
- common/random.o
-FORM_MAINOBJS=forms/main/frmMain.o
+ common/random.o common/svrblist.o
+FORM_MAINOBJS=forms/main/frmMain.o forms/main/frmMain-Window.o
 FORM_UPDATEOBJS=forms/update/frmUpdate.o
+FORM_EDITACCOUNTOBJS=forms/editaccount/frmEditAccount.o
+FORM_NEWACCOUNTOBJS=forms/newaccount/frmNewAccount.o
+FORM_CALENDAREDITOROBJS=forms/calendareditor/frmCalendarEditor.o
+FORM_EVENTEDITOROBJS=forms/eventeditor/frmEventEditor.o
 FORM_PREFERENCESOBJS=forms/preferences/frmPreferences.o
 FORM_ABOUTOBJS=forms/about/frmAbout.o
 WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
@@ -30,7 +34,9 @@ WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
  widgets/XCCalendarMonthSelect.o \
  widgets/XCCalendarList.o \
  widgets/XCCalendarListAccountCtrl.o \
- widgets/XCCalendarListCalendarCtrl.o
+ widgets/XCCalendarListCalendarCtrl.o \
+ widgets/XCCalendarMenu.o \
+ widgets/XCEventMenu.o
 CALENDARLISTOBJS=objects/calendarlist/CalendarList.o
 CALENDAROBJS=objects/calendarobject/CalendarObject-Save.o \
  objects/calendarobject/CalendarObject.o
@@ -43,12 +49,17 @@ default:
 	$(MAKE) calendardatastorage
 	$(MAKE) xestiacal
 
-forms: form_mainobjs form_preferencesobjs form_aboutobjs form_updateobjs
+forms: form_mainobjs form_editaccountobjs form_newaccountobjs \
+	form_preferencesobjs form_aboutobjs form_updateobjs \
+	form_calendareditorobjs form_eventeditorobjs
 
 xestiacal: mainobjs forms widgetsobjs commonobjs calendarlistobjs calendarobjs calendareventobjs
 	$(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) $(FORM_PREFERENCESOBJS) \
-	$(FORM_ABOUTOBJS) $(FORM_UPDATEOBJS) $(WIDGETSOBJS) $(COMMONOBJS) \
-	$(CALENDARLISTOBJS) $(CALENDAROBJS) $(CALENDAREVENTOBJS) \
+	$(FORM_ABOUTOBJS) $(FORM_UPDATEOBJS) $(FORM_EDITACCOUNTOBJS) \
+	$(FORM_NEWACCOUNTOBJS) $(FORM_CALENDAREDITOROBJS) \
+	$(FORM_EVENTEDITOROBJS) \
+	$(WIDGETSOBJS) $(COMMONOBJS) $(CALENDARLISTOBJS) $(CALENDAROBJS) \
+	$(CALENDAREVENTOBJS) \
 	-o $(XCAL_OUT) $(CPPLIBS)
 
 bitmaphelperobjs: $(BMCOOBJS)
@@ -68,6 +79,14 @@ form_mainobjs: $(FORM_MAINOBJS)
 
 form_updateobjs: $(FORM_UPDATEOBJS)
 
+form_editaccountobjs: $(FORM_EDITACCOUNTOBJS)
+
+form_newaccountobjs: $(FORM_NEWACCOUNTOBJS)
+
+form_calendareditorobjs: $(FORM_CALENDAREDITOROBJS)
+
+form_eventeditorobjs: $(FORM_EVENTEDITOROBJS)
+
 form_preferencesobjs: $(FORM_PREFERENCESOBJS)
 
 form_aboutobjs: $(FORM_ABOUTOBJS)