Merge lp:~richardson183/pchat/trunk into lp:~zachary-thibeau/pchat/trunk

[Jesse N. Richardson]

Merged the changes between my branch and the main trunk. I have made a good bit of changes for the linux build

[Zach Thibeau (zachary-thibeau)]

review looks good but I've already merged it into svn in which launchpad should of imported by now.

review: Approve

Unmerged revisions

272. By Jesse N. Richardson on 2010-12-09

Merged Changes from the main trunk branch

271. By Jesse N. Richardson on 2010-12-08

Made a good bit of changes. Changed the locations of the libs to the real path that they will be located at.

=== modified file 'PChat-linux.cbp'
--- PChat-linux.cbp	2010-12-08 22:08:48 +0000
+++ PChat-linux.cbp	2010-12-09 23:53:53 +0000
@@ -13,8 +13,22 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
+<<<<<<< TREE
+					<Add option="`pkg-config --cflags gtk+-2.0`" />
+					<Add option="-DLINUX" />
+=======
+>>>>>>> MERGE-SOURCE
 					<Add directory="/usr/include/openssl" />
+<<<<<<< TREE
+					<Add directory="/usr/include/glib-2.0/glib" />
+=======
+>>>>>>> MERGE-SOURCE
 				</Compiler>
+				<Linker>
+					<Add option="`pkg-config --libs gtk+-2.0`" />
+					<Add library="/usr/lib/libssl.a" />
+					<Add library="/usr/lib/libcrypto.a" />
+				</Linker>
 			</Target>
 			<Linker>
 					<Add option="`pkg-config --libs gtk+-2.0`" />

=== added file 'PChat-linux.layout'
--- PChat-linux.layout	1970-01-01 00:00:00 +0000
+++ PChat-linux.layout	2010-12-09 23:53:53 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Debug" />
+	<File name="src/common/xchat.h" open="1" top="1" tabpos="0">
+		<Cursor position="4519" topLine="172" />
+	</File>
+</CodeBlocks_layout_file>

=== added file 'PChat-wx.layout'
--- PChat-wx.layout	1970-01-01 00:00:00 +0000
+++ PChat-wx.layout	2010-12-09 23:53:53 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Debug" />
+</CodeBlocks_layout_file>

=== added file 'PChat.layout'
--- PChat.layout	1970-01-01 00:00:00 +0000
+++ PChat.layout	2010-12-09 23:53:53 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="" />
+</CodeBlocks_layout_file>

=== added file 'pchat-linux.workspace'
--- pchat-linux.workspace	1970-01-01 00:00:00 +0000
+++ pchat-linux.workspace	2010-12-09 23:53:53 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+	<Workspace title="Workspace">
+		<Project filename="PChat-linux.cbp" active="1" />
+	</Workspace>
+</CodeBlocks_workspace_file>

=== modified file 'src/include/version.h'
--- src/include/version.h	2010-12-07 13:30:09 +0000
+++ src/include/version.h	2010-12-09 23:53:53 +0000
@@ -1,12 +1,12 @@
 #ifndef PCHAT_VERSION_H
 #define PCHAT_VERSION_H
 
-#include "version_rev.h"
+//#include "version_rev.h"
 
 #define DO_STRINGIFY(x) #x
 #define STRINGIFY(x) DO_STRINGIFY(x)
 
-// Uncomment one of the following defines at a time 
+// Uncomment one of the following defines at a time
 // to contol the version scheme, e.g. 1.4 or 1.4.1
 #define TWO_DIGIT_VER
 //#define THREE_DIGIT_VER