irungentoo
7110001b58
Merge pull request #545 from stal888/patch-3
...
Fix build error on non-linux machines.
2013-08-30 09:27:04 -07:00
stal
0834e4ba31
Fix build error on non-linux machines.
2013-08-30 09:25:22 -07:00
irungentoo
b37a016b6b
Merge pull request #544 from KostyaKow/master
...
Made IP Port a union.
2013-08-30 04:14:46 -07:00
Kostya
25563ac070
Fixed build errors.
2013-08-30 03:28:50 -04:00
Kostya
790867d984
Changed naming for IP union.
2013-08-30 03:02:11 -04:00
Kostya
8d71f67a72
Changed handshake code to use union IP_Port.
2013-08-30 02:58:30 -04:00
Kostya
d2d1af2ce9
Made IP_Port a union.
2013-08-30 02:51:15 -04:00
irungentoo
205ba48a5a
Merge pull request #543 from jin-eld/sync-sources
...
Sync sources
2013-08-29 17:51:14 -07:00
jin-eld
fb26fe4455
Add "make dist" to travis
...
this should allow us to catch build system errors related to removing or adding
source files
2013-08-30 02:24:14 +03:00
jin-eld
93e2e1eaa0
Sync makefile with source list
...
packets.h is now gone
2013-08-30 02:19:00 +03:00
irungentoo
0ed6ce80a0
Removed now useless file.
2013-08-29 19:09:30 -04:00
irungentoo
df4b1c6ee5
Removed packet structs.
...
They were causing problems on certain compiler configurations.
2013-08-29 19:06:09 -04:00
irungentoo
ea994606fe
Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master
...
Conflicts:
toxcore/LAN_discovery.h
2013-08-29 17:55:58 -04:00
pete
82b8927af7
Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard.
2013-08-29 22:17:51 +01:00
irungentoo
85940f94b2
Fixed bug.
2013-08-29 08:03:03 -04:00
irungentoo
9e30979613
Merge pull request #540 from optimumtact/master
...
Updated bootstrap node key for my server
2013-08-29 04:23:16 -07:00
Francis Devine
77e4d8509d
Updated bootstrap node key for my server
2013-08-29 14:33:49 +12:00
irungentoo
059d2cfdb8
Use defines instead of numbers in DHT_test
2013-08-28 20:53:35 -04:00
irungentoo
1033c2d80e
Fixed possible bug.
2013-08-28 20:51:01 -04:00
irungentoo
00507fadfd
Removed some no longer needed ifdefs.
2013-08-28 18:23:37 -04:00
irungentoo
e0779ed0a6
Merge pull request #536 from jin-eld/ntox-win32
...
Make nTox work on MinGW/Win32
2013-08-27 04:46:57 -07:00
jin-eld
14a8ee4e0d
Make nTox work on MinGW/Win32
2013-08-27 14:25:09 +03:00
irungentoo
9b249c5ca8
Merge pull request #534 from jin-eld/automake-compatibility
...
Tune automake options to avoid problems with newer versions
2013-08-26 13:40:37 -07:00
jin-eld
f792b1be1f
Tune automake options to avoid problems with newer versions
...
Automake >1.14 complains if makefiles are used in subdirs but
the subdir-objects option is not set.
2013-08-26 23:29:47 +03:00
irungentoo
947d62decd
Merge pull request #533 from jin-eld/separate-lt-options
...
Move libtool options to configure script in order to allow per system settings
2013-08-26 13:00:44 -07:00
jin-eld
ed1c130ebc
Move extra libtool options into configure
...
This should allow to keep the libtool options all in one place and at
the same time define different options depending on the host.
Made sure that -no-undefined is set only on Win32. Although no side
effects on Linux and OSX have been observed so far, it's probably better
to play it safe; it does not seem to be needed/does not seem to matter on *nix,
only required for Win32.
2013-08-26 22:08:43 +03:00
jin-eld
7ce599d180
Fix trailing whitespace
2013-08-26 22:08:33 +03:00
irungentoo
c30187fcf9
Merge pull request #532 from jin-eld/freebsd
...
Add /usr/local/* to search paths on FreeBSD
2013-08-26 06:00:53 -07:00
jin-eld
2fa0b69631
Add /usr/local/* to search paths on FreeBSD
...
Seems that on FreeBSD those directories are not in the default search
paths, so we'll have to add them manually.
2013-08-26 14:34:42 +03:00
irungentoo
bc734f974a
Merge pull request #531 from jin-eld/dll
...
Also generate a .dll in MinGW builds
2013-08-25 16:28:51 -07:00
jin-eld
634a67f627
Also generate a .dll in MinGW builds
...
Previously only static a static library was produced on MinGW builds,
this PR makes sure that we also build a proper .dll
2013-08-26 02:18:09 +03:00
irungentoo
b4c358de29
Merge pull request #529 from Jman012/master
...
Fixed display issue with INSTALL.md
2013-08-25 05:33:28 -07:00
Jman012
4b6db8db7d
Fixed display issue with INSTALL.md
2013-08-24 19:42:58 -07:00
irungentoo
81a47d5c0e
Merge pull request #528 from vx-k/style_change
...
Style change
2013-08-24 18:04:07 -07:00
irungentoo
c27cf095a5
Merge pull request #527 from vx-k/master
...
Fixed semantics of tox_array so it will be more more memory efficient.
2013-08-24 18:00:22 -07:00
irungentoo
7a5f3ecbab
Merge pull request #525 from stqism/docs
...
Updated INSTALL.md to list clients, improved options
2013-08-24 17:59:58 -07:00
irungentoo
05167a9294
Merge pull request #526 from JamoBox/patch-1
...
fixed typos
2013-08-24 15:44:03 -07:00
JamoBox
7fa17f9ab4
consistency check
...
fixed grammar to maintain consistency of output
2013-08-24 23:21:48 +01:00
pete
792709e4e0
Consistency check for grammar
2013-08-24 23:11:04 +01:00
JamoBox
e44ebb184a
fixed typos
...
fixed a couple of typos in the output messages
2013-08-24 22:59:58 +01:00
Sean Qureshi
cb9a0a5ded
Updated INSTALL.md to list clients, improved options
2013-08-24 14:07:03 -07:00
Anony Moose
ae3ab2efa4
Some more style changes
2013-08-24 20:54:03 +00:00
Anony Moose
39101b00a2
Fixed style in several macros.
2013-08-24 20:52:20 +00:00
Anony Moose
4326c4c8b5
Fixed semantics of tox_array (should also be more memory efficient).
2013-08-24 20:34:38 +00:00
irungentoo
e3da5d1077
Merge pull request #523 from jin-eld/fix-configure-help-typo
...
Fix typo in configure script help text
2013-08-24 10:11:49 -07:00
jin-eld
fe7e69ac4a
Fix typo in configure script help text
...
It's "bootstrap", not "boostrap" :P
2013-08-24 16:50:11 +03:00
irungentoo
47476b375c
Merge pull request #522 from jin-eld/fix-out-of-tree-builds
...
This fixes out of tree builds
2013-08-24 06:31:25 -07:00
jin-eld
9bec6f0183
This fixes out of tree builds
...
Should be references from top_builddir
2013-08-24 16:20:48 +03:00
irungentoo
dc0bc49960
Merge pull request #521 from stqism/docs
...
Updated the INSTALL.md to reflect the new build system
2013-08-24 04:56:22 -07:00
Sean Qureshi
e1259363ed
Updated the INSTALL.md to reflect the new build system
2013-08-24 00:17:04 -07:00
