fixed: when there is no option "locale_files" in the config
the "en" should be loaded by default added: LDFLAGS option to Makefiles added: compilation with CLANG (some const objects should have been created with default cctor) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@856 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
parent
403cca5aad
commit
329e2d8001
14
Makefile
14
Makefile
|
@ -6,11 +6,17 @@ CXX = g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef CXXFLAGS
|
ifndef CXXFLAGS
|
||||||
CXXFLAGS = -fPIC -Wall -O2 -pthread -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
|
CXXFLAGS = -fPIC -Wall -O2 -pthread -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifndef LDFLAGS
|
||||||
|
LDFLAGS = -L/usr/local/lib
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
export CXX
|
export CXX
|
||||||
export CXXFLAGS
|
export CXXFLAGS
|
||||||
|
export LDFLAGS
|
||||||
|
|
||||||
|
|
||||||
all: winix.so plugins winix
|
all: winix.so plugins winix
|
||||||
|
@ -26,13 +32,13 @@ winix.so: FORCE
|
||||||
@cd ../ezc/src ; $(MAKE) -e
|
@cd ../ezc/src ; $(MAKE) -e
|
||||||
@cd ../tito/src ; $(MAKE) -e
|
@cd ../tito/src ; $(MAKE) -e
|
||||||
@cd ../pikotools ; $(MAKE) -e
|
@cd ../pikotools ; $(MAKE) -e
|
||||||
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a ../pikotools/date/date.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
|
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a ../pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
|
||||||
|
|
||||||
|
|
||||||
winix: FORCE
|
winix: winix.so FORCE
|
||||||
@cd main ; $(MAKE) -e
|
@cd main ; $(MAKE) -e
|
||||||
# use the full path with winix.so
|
# use the full path with winix.so
|
||||||
$(CXX) -o winix $(CXXFLAGS) main/*.o /home/tomek/roboczy/winix/winix.so
|
$(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) main/*.o /home/tomek/roboczy/winix/winix.so
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -268,6 +268,9 @@ void Config::SetAdditionalVariables()
|
||||||
|
|
||||||
if( locale_default_id > locale_max_id )
|
if( locale_default_id > locale_max_id )
|
||||||
locale_default_id = locale_max_id;
|
locale_default_id = locale_max_id;
|
||||||
|
|
||||||
|
if( locale_files.empty() )
|
||||||
|
locale_files.push_back(L"en");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
class Session;
|
struct Session;
|
||||||
|
|
||||||
|
|
||||||
struct PluginDataBase
|
struct PluginDataBase
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = export.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o -I/usr/local/include -L/usr/local/lib -lcurl
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o -lcurl
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = gallery.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = group.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = menu.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = stats.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = thread.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ name = ticket.so
|
||||||
all: $(name)
|
all: $(name)
|
||||||
|
|
||||||
$(name): $(o)
|
$(name): $(o)
|
||||||
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o
|
$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) $(LDFLAGS) *.o
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,13 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
HtmlTextStream::HtmlTextStream()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
without escaping
|
without escaping
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -47,6 +47,8 @@ class HtmlTextStream : public TextStream<std::wstring>
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
||||||
|
HtmlTextStream();
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
a helper struct to select a proper operator<<
|
a helper struct to select a proper operator<<
|
||||||
|
|
Loading…
Reference in New Issue