Squashed commit of Chris's networking code
commit 052d5a2ee82d14752ba7a2a89b375de0f4b3214d Author: Chris Peterson <xethm55@yahoo.com> Date: Fri Sep 14 20:49:49 2012 -0400 Damn! - Forgot to add the Types.h file commit 8bb6f6d56279289dd0c1f118dffb390dc6538a7c Author: Chris Peterson <xethm55@yahoo.com> Date: Fri Sep 14 20:41:46 2012 -0400 Fixed a lot of the lag issues. There are still some tweaks needed, but that is going to happen with the input system changes commit 0b5fe2dd64b561d965229a8dff25575eaf5c9264 Author: Chris Peterson <xethm55@yahoo.com> Date: Fri Sep 14 20:21:31 2012 -0400 Client server stuff working. A lot of lag in the system though commit 07fac2c86d3b379fd1ac287bf3f60b778ca59508 Merge: 5cfd5b2ac79196Author: Chris Peterson <xethm55@yahoo.com> Date: Fri Sep 14 17:49:18 2012 -0400 Merging in changes from Holtrop commit 5cfd5b28d5e384803ef7b807849ac570e6c84e0f Author: Chris Peterson <xethm55@yahoo.com> Date: Sun Sep 9 12:23:12 2012 -0400 Building on linux now commit 470d486cdebd95099020911dee7f9290c78ee274 Merge: 842040df072eecAuthor: Chris Peterson <xethm55@yahoo.com> Date: Sun Sep 9 11:58:39 2012 -0400 Merged in master with tank model commit 842040d0fee481f726b2ae5aec60787371af3923 Merge: 6866c589b993f2Author: Chris Peterson <xethm55@yahoo.com> Date: Thu Aug 30 23:25:19 2012 -0400 Merged in changes from upstream (holtrop/master) commit 6866c58200cc50d3ccc886266303c1b654c89527 Author: Chris Peterson <xethm55@yahoo.com> Date: Sat Aug 18 17:07:50 2012 -0400 added server code and a simple echo server.
This commit is contained in:
1 parent
05dc0b021f
commit
24a08e6017
11 files changed
+830
-24
No files matched your search
+4
-4
@@ -36,7 +36,7 @@ SFML_VERSION = '2.0-rc'
|
||||
BIN_DIR = 'bin'
|
||||
CXX = 'g++'
|
||||
CC = 'gcc'
|
||||
CXXFLAGS = ['-Wall', '-O2', '-g']
|
||||
CXXFLAGS = ['-Wall', '-O0', '-g']
|
||||
LINKFLAGS = []
|
||||
LIBS_client = []
|
||||
LIBS_server = []
|
||||
@@ -48,8 +48,8 @@ if 'SFML_PATH' in os.environ:
|
||||
LIBPATH = ['%s/lib' % SFML_PATH]
|
||||
CPPFLAGS = []
|
||||
CPPFLAGS += map(lambda x: '-I' + x, find_dirs_under('src/common'))
|
||||
CPPFLAGS_client = ['-I%s/include' % SFML_PATH,
|
||||
'-DGL_INCLUDE_FILE=\\"GL3/gl3w.h\\"']
|
||||
CPPFLAGS += ['-I%s/include' % SFML_PATH]
|
||||
CPPFLAGS_client = ['-DGL_INCLUDE_FILE=\\"GL3/gl3w.h\\"']
|
||||
CPPFLAGS_client += map(lambda x: '-I' + x, find_dirs_under('src/client'))
|
||||
CPPFLAGS_server = map(lambda x: '-I' + x, find_dirs_under('src/server'))
|
||||
|
||||
@@ -67,7 +67,7 @@ if platform == 'windows':
|
||||
else:
|
||||
LIBS_client += ['sfml-network', 'sfml-window', 'sfml-graphics',
|
||||
'sfml-system', 'GL', 'GLU']
|
||||
LIBS_server += ['sfml-network']
|
||||
LIBS_server += ['sfml-system','sfml-network']
|
||||
LINKFLAGS.append('-Wl,-R%s/lib' % SFML_PATH)
|
||||
|
||||
# our sources
|
||||
|
||||
Reference in new issue
Block a user