Commit Graph

176 Commits

Author SHA1 Message Date
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Gio
8d6d3d1894 Retroshare QML App: Implemesh some basic stuff
Implement location creation, selection and login
Implement people listing
Implement firends adding (not working yet)
Depend on androidextra qt module only if compiling for android
LibresapiLocalClient parse one line at time to avoid error if two
requests are sent rapidly one after another
LibresapiLocalClient socket path now is a parameter of openConnection()
to use it as qml type constructor without parameter must be useful
Added JSONListModel for JASON based MVC pattern
2016-09-15 13:07:13 +02:00
Gio
9d83d56811 Merge branch 'master' into android 2016-09-04 15:16:57 +02:00
Gio
3ec50837d0 Fix typos in qmake files 2016-08-31 07:41:22 +02:00
Phenom
04162f90d2 Fix Msys2 build when MINGW_PREFIX is not defined.
Please look at AppVeyor success before merging.
2016-08-27 11:28:51 +02:00
Gio
279551fe8d Retroshare android service now run and start at boot on android, the qml app is still disfunctional 2016-08-23 12:15:28 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
thunder2
81cd2e9158 Fixed MSYS2 compile (use correct bracket in pro file) 2016-08-16 09:09:19 +02:00
Phenom
3200ea57b2 Fix MSys2 Windows Compilation after #f1847a9 commit.
As used by AppVeyor.
2016-08-15 19:15:23 +02:00
thunder2
f1847a954f Changed check for MSYS2 environment for Windows compile 2016-08-15 09:57:23 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
Gio
5e1ecf3ad1 By default disable libresapilocalserver at compile time because it depends on Qt 2016-07-18 13:49:21 +02:00
Gio
b5f95cb651 libresapilocal is now optional (enabled by default) 2016-07-15 11:25:31 +02:00
Phenom
ceb092c71f Fix preprocessor for MacOS version. 2016-05-06 22:51:25 +02:00
Phenom
cb4579e8c7 Fix compilation for plugins but miss RetroShare-gui library linking.
Get ld: symbol(s) not found for architecture ...
2015-12-26 17:20:54 +01:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
2015-12-22 17:27:51 +01:00
Phenom
340e78f064 Fix MSys 32b depends and Add a specific MSys2 Makefile to compile
missing libs.
2015-10-17 12:15:36 +02:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri
And add MSys2 directories.
2015-10-17 12:15:36 +02:00
AsamK
0793a6a52d Use PLUGIN_DIR to define plugin directory only once 2015-09-06 22:27:22 +02:00
AsamK
2bf81be6a7 Disable compiling of wikis in libretroshare
It is disabled in the gui anyway
2015-09-05 09:25:08 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00
AsamK
4e917ea26c Disable compiling of pegmarkdown by default, only used for wiki
- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set
2015-09-05 09:25:08 +02:00
AsamK
b9c174ba8f Add BIN_DIR variable to allow packagers to override it 2015-08-31 22:50:46 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files
So far it only contains the default values for installation paths
2015-08-31 21:09:28 +02:00