3.15

1 files changed, 17 insertions, 12 deletions

diff --git a/RealtimeSync/makefile b/RealtimeSync/makefile
index a445b922..5f797cce 100644
--- a/RealtimeSync/makefile
+++ b/RealtimeSync/makefile
@@ -2,14 +2,17 @@ APPNAME = RealtimeSync
 prefix = /usr
 BINDIR = $(DESTDIR)$(prefix)/bin
 
+COMMON_COMPILE_FLAGS = -Wall -pipe `pkg-config --cflags gtk+-2.0` -O3 -pthread -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DTIXML_USE_STL -DWXINTL_NO_GETTEXT_MACRO
+COMMON_LINK_FLAGS  = -O3 -pthread
+
 #default build
-FFS_CPPFLAGS = -Wall -pipe -DNDEBUG -DwxUSE_UNICODE `wx-config --cxxflags --debug=no --unicode=yes` `pkg-config --cflags gtk+-2.0` -DFFS_LINUX -DTIXML_USE_STL -O3 -pthread
-LINKFLAGS    = `wx-config --libs --debug=no --unicode=yes` -lboost_thread -O3 -pthread
+FFS_CPPFLAGS = $(COMMON_COMPILE_FLAGS) `wx-config --cxxflags --debug=no --unicode=yes`
+LINKFLAGS    = $(COMMON_LINK_FLAGS) `wx-config --libs --debug=no --unicode=yes` -lboost_thread
 
 #static build used for precompiled release
 ifeq ($(BUILD),release)
-FFS_CPPFLAGS = -Wall -pipe -DNDEBUG -DwxUSE_UNICODE `wx-config --cxxflags --debug=no --unicode=yes --static=yes` `pkg-config --cflags gtk+-2.0` -DFFS_LINUX -DTIXML_USE_STL -O3 -pthread
-LINKFLAGS    = `wx-config --libs --debug=no --unicode=yes --static=yes` /usr/local/lib/libboost_thread.a -O3 -pthread
+FFS_CPPFLAGS = $(COMMON_COMPILE_FLAGS) `wx-config --cxxflags --debug=no --unicode=yes --static=yes`
+LINKFLAGS    = $(COMMON_LINK_FLAGS) `wx-config --libs --debug=no --unicode=yes --static=yes` /usr/local/lib/libboost_thread.a
 endif
 
 FILE_LIST=              #internal list of all *.cpp files needed for compilation
@@ -25,7 +28,7 @@ FILE_LIST+=../library/process_xml.cpp
 FILE_LIST+=../structures.cpp
 FILE_LIST+=../shared/util.cpp
 FILE_LIST+=../shared/check_exist.cpp
-FILE_LIST+=../shared/localization_no_BOM.cpp
+FILE_LIST+=../shared/i18n_no_BOM.cpp
 FILE_LIST+=../shared/inotify/inotify-cxx.cpp
 FILE_LIST+=../shared/tinyxml/tinyxml.cpp
 FILE_LIST+=../shared/tinyxml/tinyxmlerror.cpp
@@ -37,13 +40,14 @@ FILE_LIST+=../shared/zstring.cpp
 FILE_LIST+=../shared/xml_base.cpp
 FILE_LIST+=../shared/custom_button.cpp
 FILE_LIST+=../shared/file_handling.cpp
+FILE_LIST+=../shared/resolve_path.cpp
 FILE_LIST+=../shared/file_traverser.cpp
 FILE_LIST+=../shared/standard_paths.cpp
 FILE_LIST+=../shared/help_provider.cpp
 FILE_LIST+=../shared/file_io.cpp
 
 #list of all *.o files
-OBJECT_LIST=$(foreach file, $(FILE_LIST), OBJ/$(subst .cpp,.o,$(notdir $(file))))
+OBJECT_LIST=$(foreach file, $(FILE_LIST), ../OBJ/RTS_Release_GCC_Make/$(subst .cpp,.o,$(notdir $(file))))
 
 #build list of all dependencies
 DEP_LIST=$(foreach file, $(FILE_LIST), $(subst .cpp,.dep,$(file)))
@@ -52,23 +56,24 @@ DEP_LIST=$(foreach file, $(FILE_LIST), $(subst .cpp,.dep,$(file)))
 all: RealtimeSync
 
 init: 
-	if [ ! -d OBJ ]; then mkdir OBJ; fi
+	if [ ! -d ../OBJ ]; then mkdir ../OBJ; fi
+	if [ ! -d ../OBJ/RTS_Release_GCC_Make ]; then mkdir ../OBJ/RTS_Release_GCC_Make; fi
 #remove byte ordering mark: needed by Visual C++ but an error with GCC
-	g++ -o OBJ/removeBOM ../tools/remove_BOM.cpp 
-	./OBJ/removeBOM ../shared/localization.cpp ../shared/localization_no_BOM.cpp
+	g++ -o ../OBJ/RTS_Release_GCC_Make/removeBOM ../tools/remove_BOM.cpp 
+	../OBJ/RTS_Release_GCC_Make/removeBOM ../shared/i18n.cpp ../shared/i18n_no_BOM.cpp
 
 %.dep : %.cpp 
  #strip path information
-	g++ $(FFS_CPPFLAGS) -c $< -o OBJ/$(subst .cpp,.o,$(notdir $<))
+	g++ $(FFS_CPPFLAGS) -c $< -o ../OBJ/RTS_Release_GCC_Make/$(subst .cpp,.o,$(notdir $<))
 
 RealtimeSync: init $(DEP_LIST)
 #respect linker order: wxWidgets libraries last
 	g++ -o ../BUILD/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS)
 
 clean:
-	rm -rf OBJ
+	rm -rf ../OBJ/RTS_Release_GCC_Make
 	rm -f ../BUILD/$(APPNAME)
-	rm -f ../shared/localization_no_BOM.cpp
+	rm -f ../shared/i18n_no_BOM.cpp
 
 install:
 	if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR); fi