From b9203ee84953006547f4afd58f405874c87bf0dc Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:02:17 +0200 Subject: 3.1 --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 03ef7e97..fbd02827 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CPPFLAGS=-Wall -pipe -DNDEBUG -DwxUSE_UNICODE `wx-config --cxxflags --debug=no --unicode=yes` `pkg-config --cflags gtk+-2.0` -DFFS_LINUX -DTIXML_USE_STL -DZSTRING_CHAR -O3 -pthread -c -Ishared/boost_1_40_0 -LINKFLAGS=`wx-config --libs --debug=no --unicode=yes` -O3 -pthread +LINKFLAGS=`wx-config --libs --debug=no --unicode=yes` shared/ossp_uuid/.libs/libuuid++.a -O3 -pthread FILE_LIST= #internal list of all *.cpp files needed for compilation FILE_LIST+=structures.cpp @@ -16,6 +16,7 @@ FILE_LIST+=ui/settingsDialog.cpp FILE_LIST+=ui/checkVersion.cpp FILE_LIST+=ui/batchStatusHandler.cpp FILE_LIST+=ui/guiStatusHandler.cpp +FILE_LIST+=ui/trayIcon.cpp FILE_LIST+=library/customGrid.cpp FILE_LIST+=library/errorLogging.cpp FILE_LIST+=library/statusHandler.cpp @@ -26,6 +27,7 @@ FILE_LIST+=library/statistics.cpp FILE_LIST+=library/filter.cpp FILE_LIST+=shared/dragAndDrop.cpp FILE_LIST+=shared/localization.cpp +FILE_LIST+=shared/guid.cpp FILE_LIST+=shared/tinyxml/tinyxml.cpp FILE_LIST+=shared/tinyxml/tinystr.cpp FILE_LIST+=shared/tinyxml/tinyxmlerror.cpp @@ -59,12 +61,15 @@ removeBOM: tools/removeBOM.cpp g++ -o removeBOM tools/removeBOM.cpp ./removeBOM shared/localization.cpp +osspUUID: + cd shared/ossp_uuid && chmod +x configure && chmod +x shtool && ./configure --with-cxx --disable-shared && make clean && make && make check + %.dep : %.cpp #strip path information g++ $(CPPFLAGS) $< -o OBJ/$(subst .cpp,.o,$(notdir $<)) -FreeFileSync: init removeBOM $(DEP_LIST) - g++ $(LINKFLAGS) -o BUILD/FreeFileSync $(OBJECT_LIST) +FreeFileSync: init removeBOM osspUUID $(DEP_LIST) + g++ -o BUILD/FreeFileSync $(OBJECT_LIST) $(LINKFLAGS) clean: find OBJ -type f -exec rm {} \; -- cgit