Commit Graph

104 Commits

Author SHA1 Message Date
sehraf
ada1cee2c8 remove deprecated ssh/protobuf code 2016-10-08 12:59:27 +02:00
thunder2
ea6431e276 Fixed Windows shadow build with Qt 5.6 or higher 2016-09-05 16:24:49 +02:00
Gio
fe7de83529 WebUI is now optional but enabled by default at compile time 2016-07-28 14:08:49 +02:00
thunder2
8dde723e90 Added security hardening flags for ASLR and DEP protection for Windows compile. 2016-01-28 19:02:42 +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
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
defnax
c41f98cb4c Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch
Fix Windows 7 32b Compilation from scratch.
2015-11-06 01:58:30 +01:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri
And add MSys2 directories.
2015-10-17 12:15:36 +02:00
AsamK
fe1ec9d510 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro 2015-09-06 22:27:22 +02:00
AsamK
571336e1f4 Move duplicate common stuff out of platform parts 2015-09-06 22:27:22 +02:00
AsamK
66b9557833 Use PKGCONFIG instead of manually specifying LIBS for Linux
- The advantage is that this method automatically includes additional
  dependencies of LIBS (e.g. libupnp needs -lixml).
- Also if some distribution moves headers to non default locations the
  correct locations get added by PKGCONFIG
2015-09-06 22:27:22 +02:00
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00
thunder2
b1b2de617a Fixed Windows compile.
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
2015-09-03 13:14:39 +02:00
AsamK
d116f40d6e Move openpgpsdk to common section of libretroshare.pro
It is the same for all platforms
2015-09-01 14:53:17 +02:00
AsamK
829c2f396e Move LIBS from gui/nogui linux section to libretroshare
remove -lglib-2.0 it's not needed:
was added in d8e327afcc to compile for arch,
but it compiles on arch now also without this
2015-09-01 14:53:17 +02:00
AsamK
846f7d0204 Make usage of sqlcipher explicit at compile time
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
2015-09-01 14:53:09 +02:00
AsamK
dca295143a Use CONFIG+=create_prl for libretroshare
Allows to specify all LIBS in libretroshare.pro so they don't also have
to be specified in gui/nogui.pro
2015-08-31 22:50:47 +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
AsamK
f002310cf2 Remove libpegmarkdown from win32 retroshare-nogui build
It is only needed for gui
2015-08-29 13:12:57 +02:00
AsamK
5ae5d76ffc Make file names consistent with packaging
Rename executables:
RetroShare -> RetroShare06
retroshare-nogui -> RetroShare06-nogui

Add 06 suffix to icons and desktop file

Update README, debian rules and windows installer file
2015-08-24 00:03:57 +02:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
electron128
7b5bfc99d3 added terminal restore to rs-nogui on linux. Enabled compile of webui in rs-nogui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-03 14:46:10 +00:00
electron128
73a6ca8af6 - added support for multiple client threads to ApiServer
- added api client which reads the password from stdin. This allows to login from the webinterface and from the terminal at the same time.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-31 18:00:40 +00:00
csoler
dab821cc1e disabled webui as a default setting
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-20 21:29:06 +00:00
electron128
ad1bc7f3b8 added resource_api and rs-nogui-webui (requires libmicrohttpd, Html files are not included)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-18 18:48:43 +00:00
csoler
6585cfca2c fixed compilation on debian squeeze. Removed placeHolder properties in CreateGxsForumMsg.ui and GxsGroupDialog.ui which need to be set in the cpp. Added a new DEFINE=NO_SQLCIPHER to compile without sqlcipher when sqlcipher cannot be found (no sqlcipher is available on debian squeeze).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-02-13 19:34:38 +00:00
thunder2
7f58460e5f Added DEPENDPATH to pro files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-01-12 23:14:35 +00:00
thunder2
dd1f88a1bb Replaced external library libcrypt32-cygwin.a by libcrypt32.a from MinGW for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-08 16:44:25 +00:00
thunder2
d0238810b7 Common folders for libraries, includes and binaries of all external libraries for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-05 15:31:00 +00:00
csoler
62dc21d3b7 added missing -lpthread for some systems
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-09 17:05:20 +00:00
csoler
c7f551a0d1 added missing dependencies in INCLUDEPATH if sqlcipher is not installed in the system
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-06 16:48:39 +00:00
csoler
e7489ea2dc patch from serhaf to fix auto-detection of sqlcipher
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-07-09 18:11:10 +00:00
thunder2
4c6ab35867 Updated external library to openssl-1.0.1h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-06-05 23:51:48 +00:00
thunder2
9ea4ab24e0 Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-10 23:15:24 +00:00
thunder2
98e4271695 Fixed compile on Windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 21:59:55 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk.
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 14:16:15 +00:00
drbob
7ca3ed78ae fixed up nogui for new rsaccounts stuff.
added missing OSX make stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 03:26:26 +00:00
drbob
6855a7ac98 Added OSX protobuf section.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 03:22:41 +00:00
csoler
630824aa1b Updated the notification system. Main changes are:
- the notification system is now a service, p3Notify, that is a public RsNotify.
- RsNotify does nothing except providing a registration system for new notify clients.
- Clients should derive a notify client from the NotifyClient class and register it to rsNotify
- all registered clients get all notifications, so only derive the needed methods. This should allow 
  plugins to get notifications as well.
- updated the code to call RsServer::notify()->[notification method] from inside libretroshare
- pqiNotify has been removed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-07 22:51:22 +00:00
thunder2
13e7ac8b43 Fixed compile of the libraries with MinGW 4.8 on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 23:11:10 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 16:23:02 +00:00
drbob
420fadb5c3 updated nogui for latest V0.6 changes.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 13:16:51 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 13:50:34 +00:00
csoler
299678b9c8 patch from Stefan Sperling to allow openbsd compilation.Forgot these files last time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 17:38:51 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-05 18:57:56 +00:00
csoler
8d7bbb25f8 fixed slite lib linkage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-25 19:48:51 +00:00