No OneTemporary
Actions

Authored By

Unknown

Size

45 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 492b5de6..ba9d680f 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,258 +1,261 @@
	# -------------------------------------------------------
	# r-tech1 cmake build script. Creates makefiles for unix
	# based systems, cygwin(sp?) or mingw
	#
	# Written by: juvinious
	# -------------------------------------------------------

	# -------------------------------------------------------
	# Ensure that we are doing an out of source build
	# Prevents any mishaps
	# Also remove the makefile to regenerate the filelist
	# -------------------------------------------------------
	cmake_minimum_required(VERSION 2.6)
	if(EXISTS ${CMAKE_SOURCE_DIR}/CMakeCache.txt)
	file(REMOVE ${CMAKE_SOURCE_DIR}/CMakeCache.txt)
	file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/CMakeFiles)
	endif(EXISTS ${CMAKE_SOURCE_DIR}/CMakeCache.txt)
	if(EXISTS ${CMAKE_BINARY_DIR}/Makefile)
	file(REMOVE ${CMAKE_BINARY_DIR}/Makefile)
	endif(EXISTS ${CMAKE_BINARY_DIR}/Makefile)
	if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
	if(UNIX AND NOT CYGWIN)
	message(FATAL_ERROR "Oops. Don't do an in-source build. Create an extra directory change into it and run cmake pointing to the base directory. IE: \nmkdir mybuild && cd mybuild && cmake ../ && make\nYou may need to remove CMakeCache.txt and the CMakeFiles directory in ${CMAKE_SOURCE_DIR} if you can't get rid of this error.")
	else(UNIX AND NOT CYGWIN)
	message(FATAL_ERROR "Oops. Don't do an in-source build. Create an extra directory change into it and run cmake pointing to the base directory. IE: \nmkdir mybuild; cd mybuild; cmakesetup ../\nYou may need to remove CMakeCache.txt and the CMakeFiles directory in ${CMAKE_SOURCE_DIR} if you can't get rid of this error.")
	endif(UNIX AND NOT CYGWIN)
	endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})

	# -------------------------------------------------------
	# Output directories
	# -------------------------------------------------------
	set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)


	# -------------------------------------------------------
	# Directory in which extra macros can be found
	# -------------------------------------------------------
	list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

	# -------------------------------------------------------
	# Add in uninstall target
	# -------------------------------------------------------
	configure_file(
	"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
	IMMEDIATE @ONLY)

	add_custom_target(uninstall
	"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

	# -------------------------------------------------------
	# project name
	# -------------------------------------------------------
	project (r-tech1 C CXX)

	# -------------------------------------------------------
	# Including needed macros
	# -------------------------------------------------------
	include(CheckCSourceCompiles)
	include(CheckCXXSourceCompiles)
	find_package(ZLIB)
	find_package(PNG)
	find_package(FREETYPE)
	find_package(Threads)
	#find_package(GNUREGEX)
	find_package(VORBIS)
	find_package(OGG)
	find_package(MPG123)

	# -------------------------------------------------------
	# Include Source
	# -------------------------------------------------------
	mark_as_advanced(CLEAR ZLIB_INCLUDE_DIR)
	mark_as_advanced(CLEAR ZLIB_LIBRARY)

	mark_as_advanced(CLEAR PNG_PNG_INCLUDE_DIR)
	mark_as_advanced(CLEAR PNG_LIBRARY)

	# -------------------------------------------------------
	# User setable options
	# -------------------------------------------------------
	option(DEBUG "Compile r-tech1 with debug information?" OFF)

	if($ENV{DEBUG})
	set(DEBUG ON)
	elseif(NOT $ENV{DEBUG})
	set(DEBUG OFF)
	endif($ENV{DEBUG})

	if(DEBUG)
	add_definitions(-DDEBUG)
	set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-variable -Wno-unused-function -funroll-loops -fexpensive-optimizations -Woverloaded-virtual -g3 -ggdb")
	set(CMAKE_C_FLAGS "-Wall -Wno-unused-variable -Wno-unused-function -funroll-loops -fexpensive-optimizations -g3 -ggdb")
	else(DEBUG)
	set(CMAKE_CXX_FLAGS "-O2 -Wall -Wno-unused-variable -Wno-unused-function -funroll-loops -fexpensive-optimizations -Woverloaded-virtual")
	set(CMAKE_C_FLAGS "-O2 -Wall -Wno-unused-variable -Wno-unused-function -funroll-loops -fexpensive-optimizations")
	endif(DEBUG)

	-# Disabled for now
	-# add_definitions(-DHAVE_NETWORKING)
	+# Networking
	+add_definitions(-DHAVE_NETWORKING)

	add_definitions(-DHAVE_CXX11 -DDUMB_DECLARE_DEPRECATED)

	option(USE_ALLEGRO5 "Compile r-tech1 with ALLEGRO 5 instead of SDL or Allegro 4.x?" ON)

	if($ENV{ALLEGRO5})
	set(USE_ALLEGRO5 ON)
	elseif(NOT $ENV{ALLEGRO5})
	set(USE_ALLEGRO5 OFF)
	endif($ENV{ALLEGRO5})

	if(OGG_FOUND)
	add_definitions(-DHAVE_OGG)
	set(OGG_LIBS ${OGG_LIBRARY} ${VORBIS_LIBRARIES})
	set(OGG_INCLUDES ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
	else(OGG_FOUND)
	set(OGG_LIBS "")
	set(OGG_INCLUDES "")
	endif(OGG_FOUND)

	# Allegro5
	find_package(ALLEGRO5)
	if(NOT ALLEGRO_FOUND)
	message(FATAL_ERROR "Couldn't find Allegro 5 and/or a required Allegro 5 module")
	endif(NOT ALLEGRO_FOUND)
	set(GRAPHICS_LIBRARIES ${ALLEGRO_LIBRARIES})
	set(GRAPHICS_INCLUDES ${ALLEGRO_INCLUDE_DIR})

	if(MPG123_FOUND)
	add_definitions(-DHAVE_MP3_MPG123)
	set(MP3_LIBS ${MPG123_LIBRARY})
	set(MP3_INCLUDES ${MPG123_INCLUDE_DIR})
	else(MPG123_FOUND)
	if (SDL_FOUND)
	# Try looking for libmad instead only if SDL is available
	find_package(MAD)
	if (MAD_FOUND)
	add_definitions(-DHAVE_MP3_MAD)
	set(MP3_LIBS ${MAD_LIBRARY})
	set(MP3_INCLUDES ${MAD_INCLUDE_DIR})
	else(MAD_FOUND)
	set(MP3_LIBS "")
	set(MP3_INCLUDES "")
	endif(MAD_FOUND)
	endif (SDL_FOUND)
	endif(MPG123_FOUND)

	# freetype
	if(NOT FREETYPE_FOUND)
	message(FATAL_ERROR "Couldn't find freetype")
	endif(NOT FREETYPE_FOUND)

	# -------------------------------------------------------
	# Paths and system setup
	# -------------------------------------------------------

	# -------------------------------------------------------
	# MINGW
	# -------------------------------------------------------

	if(MINGW OR CYGWIN)
	# -------------------------------------------------------
	# Take those user options and set the necessary compile time preprocessors
	# -------------------------------------------------------
	add_definitions(-DWINDOWS)
	set(WIN_LIB -lgdi32 -luser32 -lwsock32)
	set(CMAKE_THREAD_LIBS_INIT -lpthreadGC2)
	else(MINGW OR CYGWIN)
	set(CMAKE_THREAD_LIBS_INIT -lpthread)
	endif(MINGW OR CYGWIN)

	# -------------------------------------------------------
	# Apple OSX
	# -------------------------------------------------------

	if(APPLE)
	# -------------------------------------------------------
	# Added stuff for osx
	# -------------------------------------------------------
	set(WIN_LIB "-framework Carbon")
	add_definitions(-DMACOSX)

	# Groups
	set(GROUP_START "-Wl,-all_load")
	set(GROUP_END "")
	else(APPLE)
	# Groups
	set(GROUP_START "-Wl,--start-group")
	set(GROUP_END "-Wl,--end-group")
	endif(APPLE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	-include_directories(src src/libs/hawknl src/libs/dumb/include include ${GRAPHICS_INCLUDES} ${FREETYPE_INCLUDE_DIR} ${OGG_INCLUDES} ${MP3_INCLUDES})
	+include_directories(src src/libs src/libs/hawknl src/libs/dumb/include include ${GRAPHICS_INCLUDES} ${FREETYPE_INCLUDE_DIR} ${OGG_INCLUDES} ${MP3_INCLUDES})

	# -------------------------------------------------------
	# Put the linked libraries together
	# -------------------------------------------------------
	set(REQUIRED_LIBS ${GRAPHICS_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${FREETYPE_LIBRARIES} ${PNG_LIBRARY} ${ZLIB_LIBRARY} ${OGG_LIBS} ${MP3_LIBS} ${WIN_LIB} ${WINSOCK})

	# -------------------------------------------------------
	# Source files
	# -------------------------------------------------------

	#Base Source
	add_subdirectory(${CMAKE_SOURCE_DIR}/src)

	# 7z
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/7z)

	#Dumb
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/dumb)

	#Hawknl
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/hawknl)

	#Minizip
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/zip)

	# SFL
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/sfl)

	# GME Library
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/gme)

	# PCRE
	add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/pcre)

	+# LZ4
	+add_subdirectory(${CMAKE_SOURCE_DIR}/src/libs/lz4)
	+
	# Create r-tech1 library
	-add_library(r-tech1 ${SFL_SRC} ${UTIL_SRC} ${PCRE_SRC} ${x7Z_SRC} ${DUMB_SRC} ${MINIZIP_SRC} ${HAWKNL_SRC} ${GME_SRC})
	+add_library(r-tech1 ${SFL_SRC} ${UTIL_SRC} ${PCRE_SRC} ${x7Z_SRC} ${DUMB_SRC} ${MINIZIP_SRC} ${HAWKNL_SRC} ${GME_SRC} ${LZ4_SRC})

	# Init test
	add_executable(init-test tests/init/main.cpp)
	target_link_libraries(init-test r-tech1 ${REQUIRED_LIBS})

	# Install
	install (TARGETS r-tech1 DESTINATION lib)
	install (DIRECTORY ${CMAKE_SOURCE_DIR}/include/r-tech1 DESTINATION include)

	# Pkgconfig
	if(UNIX OR LINUX OR CYGWIN OR MINGW)
	if(DEBUG)
	set(lib "r-tech1-debug")
	set(libs
	"allegro-debug-5 allegro_ttf-debug-5 allegro_memfile-debug-5 allegro_image-debug-5 allegro_primitives-debug-5 allegro_audio-debug-5 allegro_acodec-debug-5 freetype2 zlib")
	else(DEBUG)
	set(lib "r-tech1")
	set(libs
	"allegro-5 allegro_ttf-5 allegro_memfile-5 allegro_image-5 allegro_primitives-5 allegro_audio-5 allegro_acodec-5 freetype2 zlib")
	endif(DEBUG)
	set(prefix ${CMAKE_INSTALL_PREFIX})
	set(rtech1_version "1")
	configure_file(${CMAKE_SOURCE_DIR}/misc/r-tech1.pc.in ${LIBRARY_OUTPUT_PATH}/pkgconfig/${lib}.pc @ONLY)
	install(FILES ${LIBRARY_OUTPUT_PATH}/pkgconfig/${lib}.pc DESTINATION lib/pkgconfig)
	endif(UNIX OR LINUX OR CYGWIN OR MINGW)

	diff --git a/SConscript b/SConscript
	index f6196a40..341454b0 100644
	--- a/SConscript
	+++ b/SConscript
	@@ -1,126 +1,131 @@
	import os
	import sys

	Import('root')

	sys.path.append(Dir('.').rel_path(Dir("#%s" % root)))

	import scons_rtech1.utils
	import scons_rtech1.checks

	Import('env')
	Import('build_dir_root')

	build_type = 'release'
	if scons_rtech1.utils.useAndroid():
	build_type = 'armeabi-v7a'
	if scons_rtech1.utils.useAndroidX64():
	build_type = 'android-x64'

	config = env.Configure(custom_tests = {'CheckAllegro5': scons_rtech1.checks.checkAllegro5(scons_rtech1.checks.debug()),
	'CheckFreetype': scons_rtech1.checks.checkFreetype,
	'ConfigChecks': scons_rtech1.checks.configChecks,
	'CheckCXX11': scons_rtech1.checks.checkCXX11,})

	if scons_rtech1.utils.useAndroidX64():
	env['HAVE_ALLEGRO5'] = True
	env.Append(CPPDEFINES = ['USE_ALLEGRO5'])
	else:
	config.CheckAllegro5()
	config.CheckFreetype()
	config.CheckCXX11()

	config.ConfigChecks()
	env = config.Finish()

	if not env['HAVE_ALLEGRO5'] or not env['HAVE_CXX11']:
	Exit(1)

	if scons_rtech1.utils.useLLVM():
	env['CXX'] = 'clang++'
	env['CC'] = 'clang'

	if scons_rtech1.checks.debug():
	env.Append(CXXFLAGS = ['-g3','-ggdb'])

	build_dir = '%s/%s' % (build_dir_root, build_type if not scons_rtech1.checks.debug() else 'debug')
	-options = {'networking': False,
	+options = {'networking': True,
	'allegro5': True
	}

	def getLibName():
	if scons_rtech1.utils.useAndroid():
	return 'lib/r-tech1-arm'
	if scons_rtech1.checks.debug():
	return 'lib/r-tech1-debug'
	return 'lib/r-tech1'

	libname = getLibName()

	-env.Append(CPPPATH = [Dir('include', Dir('.').rel_path(Dir('#' + root)))])
	+env.Append(CPPPATH = [Dir('include', Dir('.').rel_path(Dir('#' + root))), Dir('src/libs')])

	env.VariantDir(build_dir, 'src')
	libs = env.SConscript('src/SConscript', variant_dir=build_dir, exports=['env', 'options', 'root'])
	rtech1 = env.StaticLibrary(libname, libs)
	Alias('rtech1', rtech1)

	tests_build_dir = os.path.join(build_dir, 'tests')
	unit_tests = []
	if not scons_rtech1.utils.useAndroid():
	unit_tests = SConscript('tests/SConscript', variant_dir = tests_build_dir, exports = ['env', 'rtech1', 'root'], duplicate=0)
	env.Depends(unit_tests, rtech1)

	if os.access(env.installPrefix, os.W_OK):
	installEnv = env.Clone(tools = ['textfile'])
	# Install target and configuration
	installEnv.Install('{0}/lib'.format(installEnv.installPrefix), rtech1)

	header_prefix = '{0}/include/r-tech1'.format(installEnv.installPrefix)

	include_dir = 'include/r-tech1'
	for root, dirs, files in os.walk(include_dir):
	for file in files:
	installEnv.Install(header_prefix + root[len(include_dir):], os.path.join(root, file))
	-
	- installEnv.Install(os.path.join(header_prefix, 'lz4'), 'src/libs/lz4/lz4.h')
	+
	+ libs_dir = 'src/libs'
	+ for root, dirs, files in os.walk(libs_dir):
	+ for file in files:
	+ if file.endswith('.h'):
	+ # print os.path.dirname(os.path.join(root, file)[len('src'):])
	+ installEnv.Install(header_prefix + os.path.dirname(os.path.join(root, file)[len('src'):]), os.path.join(root, file))

	# pkg-config file create
	pc_mod, pc_install = scons_rtech1.utils.pc_install(installEnv, build_dir, scons_rtech1.checks.debug())

	# Install pkg-config file
	installEnv.Alias('install', [installEnv.installPrefix, pc_install])
	installEnv.Depends([installEnv.installPrefix, pc_mod], rtech1)

	# Uninstall target
	installEnv.Command("uninstall", None, Delete(FindInstalledFiles()))
	else:
	def needsudo(target, source, env):
	print 'No write priveleges to {0}, run target [{1}] as sudo'.format(env.installPrefix, target[0])
	env.Command('install', None, needsudo)
	env.Depends('install', ['rtech1', 'tests'])
	env.Command('uninstall', None, needsudo)
	env.Depends('uninstall', ['rtech1', 'tests'])

	include_dir = 'include/r-tech1'
	root_dir = Dir('include/r-tech1', Dir('#%s' % root)).abspath
	for myroot, dirs, files in os.walk(root_dir):
	for file in files:
	source = os.path.join(myroot, file)
	dir = myroot[len(root_dir) + 1:]
	destination = Dir(dir, Dir('headers/r-tech1', Dir(build_dir))).abspath

	env['RTECH1_HEADERS'] = [Dir('include', Dir('.').rel_path(Dir('#%s' % root))).abspath]

	# Unit tests
	env.Alias('tests', unit_tests)

	for test in unit_tests:
	orig = str(test).translate(None,'[]\'')
	to = orig.replace('{0}/tests/'.format(build_dir), '')
	#print orig, to
	copy = Command('bin/{0}'.format(to), orig, Copy('$TARGET', '$SOURCE'))
	env.Depends(copy, test)
	env.AlwaysBuild(copy)
	env.Alias('tests', copy, copy[0].abspath)

	Return('rtech1')
	diff --git a/include/r-tech1/network/network.h b/include/r-tech1/network/network.h
	index 9e2a60d8..b8acfbf0 100644
	--- a/include/r-tech1/network/network.h
	+++ b/include/r-tech1/network/network.h
	@@ -1,137 +1,137 @@
	#ifndef _rtech1_network_h
	#define _rtech1_network_h

	#include <stdint.h>
	#ifdef HAVE_NETWORKING
	-#include "hawknl/nl.h"
	+#include "hawknl/hawknl/nl.h"
	#endif
	#include <string>
	#include <vector>
	#include <exception>

	namespace Network{

	#ifdef HAVE_NETWORKING
	typedef NLsocket Socket;
	#else
	typedef int Socket;
	#endif

	const int NO_CONNECTIONS_PENDING = 1;
	const int NETWORK_ERROR = 2;

	const int DATA_SIZE = 16;

	class NetworkException: public std::exception{
	public:
	NetworkException( const std::string message = "" ):std::exception(),message(message){}

	inline const std::string getMessage() const {
	return message;
	}

	~NetworkException() throw();

	protected:
	inline void setMessage( const std::string & m ){
	this->message = m;
	}

	private:
	std::string message;
	};

	class NoConnectionsPendingException: public NetworkException{
	public:
	NoConnectionsPendingException(const std::string message = ""):
	NetworkException(message){
	}
	};

	class MessageEnd: public NetworkException {
	public:
	MessageEnd();
	};

	class InvalidPortException: public NetworkException{
	public:
	InvalidPortException( int port, const std::string message = "" );
	};

	class CannotListenException: public NetworkException{
	public:
	CannotListenException( const std::string message = "" ):
	NetworkException( message ){
	}
	};

	/*
	template <class M>
	int totalSize(const std::vector<M> & messages);

	template <class M>
	void dump(const std::vector<M> & messages, uint8_t * buffer );
	*/

	int8_t read8(Socket socket);
	int16_t read16(Socket socket);
	int32_t read32(Socket socket);
	char * dump16(char * where, int16_t length);
	char * dump32(char * where, uint32_t length);
	void send16(Socket socket, int16_t length);

	/* Reads a string by expecting the string to be terminated with a null byte */
	std::string readStr(Socket socket, const uint16_t length);

	/* This will send a string plus its null byte. If you just wanted to send the string
	* without a null byte then use sendBytes(socket, str.c_str(), str.size())
	*/
	void sendStr(Socket socket, const std::string & str );
	void sendBytes(Socket socket, const uint8_t * data, int length);
	void sendAllBytes(Socket socket, const uint8_t * data, int length);
	void readBytes(Socket socket, uint8_t * data, int length);
	/* reads as many bytes as possible in one go. useful for udp where partial packets
	* are discarded.
	*/
	int readUptoBytes(Socket socket, uint8_t * data, int length);

	/* Copies the string plus its null byte to the `where' buffer.
	* Returns a pointer that is where + str.size() + 1
	*/
	char * dumpStr(char * where, const std::string & str);
	char * parse16(char * where, uint16_t * out);
	char * parse32(char * where, uint32_t * out);

	/* Reads a string into 'out' from 'where' that is expected to be 'length' bytes.
	* Right now the function lies, it just does *out = string(where) so if the actual
	* string is longer than 'length' the returned pointer will be into the middle
	* of the 'where' buffer.
	*/
	char * parseString(char * where, std::string * out, uint16_t length);
	void init();
	void shutdown();
	/* Whether or not blocking is enabled by default for new sockets */
	void blocking(bool b);
	/* Enable/disable blocking for a specific socket */
	bool blocking(Socket s, bool b);
	/* Enable/disable NODELAY -- the Nagle algorithm for TCP */
	bool noDelay(Socket s, bool b);

	/* Whether or not new sockets re-use ports */
	void reuseSockets(bool what);

	void listen(Socket s) throw (NetworkException);
	Socket accept(Socket s) throw (NetworkException);

	Socket openReliable(int port);
	Socket openUnreliable(int port);
	Socket connectReliable(std::string server, int port);
	Socket connectUnreliable(std::string server, int port);
	void close(Socket);
	void closeAll();

	static std::vector<Socket> open_sockets;

	}

	#endif
	diff --git a/misc/r-tech1.pc.in b/misc/r-tech1.pc.in
	index 0c1371ae..d43d6dea 100644
	--- a/misc/r-tech1.pc.in
	+++ b/misc/r-tech1.pc.in
	@@ -1,14 +1,14 @@
	prefix=@prefix@
	exec_prefix=${prefix}
	libdir=${prefix}/lib
	includedir=${prefix}/include
	version=@rtech1_version@
	lib=@lib@
	libs=@libs@

	Name: ${lib}
	Description: R-Tech1 Library Wrapper Utility
	Version: ${version}
	Libs: -L${libdir} -l${lib}
	-Cflags: -I${includedir} -I${includedir}/r-tech1
	+Cflags: -I${includedir} -I${includedir}/r-tech1 -I${includedir}/r-tech1/libs
	Requires: ${libs}
	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index d54616ed..a894a938 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -1,106 +1,105 @@
	# -------------------------------------------------------
	# util cmake build script for r-tech1.
	# Written by: juvinious
	# Modified by: kazzmir
	# -------------------------------------------------------
	project (util C CXX)

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	set(UTIL_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/argument.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/configuration.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/network/network.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/network/chat.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/network/irc.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/token.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/resource.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/tokenreader.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/timedifference.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/debug.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/timer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/init.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/utf.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/console.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/keyboard.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/loading.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/messages.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/graphics/bitmap.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/graphics/image.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/events.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/font.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/font_factory.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/graphics/fire.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/ftalleg.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/funcs.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/directory.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/file-system.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/graphics/gradient.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/ebox.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/regex.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/language-string.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/thread.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/text-input.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/input-manager.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/input-source.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/joystick.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/allegro5/joystick.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/touch.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/allegro5/touch.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/xenon/xenon.cpp
	-${CMAKE_CURRENT_SOURCE_DIR}/libs/lz4/lz4.c
	${CMAKE_CURRENT_SOURCE_DIR}/system.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/compress.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/message-queue.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/input/linux_joystick.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/exceptions/load_exception.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/windows/system.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/nacl/module.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/nacl/network-system.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/exceptions/exception.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/actionfactory.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/action_speed.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/menu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/font-info.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/menu_action.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/menu_option.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/options.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/menu/optionfactory.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/animation.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/box.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/container.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/context-box.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/coordinate.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/cutscene.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/fadetool.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/lineedit.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/list.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/rectarea.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/popup-box.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/scroll-list.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/select-list.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/tab-container.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/tabbed-box.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/timer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gui/widget.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/sound/sound.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/sound/audio.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/sound/music-player.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/sound/music-renderer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/sound/music.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/system/timer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/system/allegro5/timer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/system/allegro5/init.cpp
	PARENT_SCOPE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	#include_directories(include include/internal)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	# add_library (util_module ${UTIL_SRC})
	diff --git a/src/SConscript b/src/SConscript
	index 24500af4..77d4b9ac 100644
	--- a/src/SConscript
	+++ b/src/SConscript
	@@ -1,72 +1,79 @@
	Import('env', 'options', 'root')

	#import sys
	#sys.path.append(Dir('..').rel_path(Dir("#r-tech1")))
	#print sys.path
	#import scons_rtech1.helpers

	import imp

	helpers_source = File("scons_rtech1/helpers.py", Dir(".").rel_path(Dir("#%s" % root)))
	helpers = imp.load_source("scons_rtech1.helpers", helpers_source.abspath)
	# from scons import helpers
	import os.path

	def tryKey(hashx, key, default):
	try:
	return hashx[key]
	except KeyError:
	return default

	def useNetwork(options):
	return tryKey(options, 'networking', False)

	def utilLibrary(env):
	modules = helpers.read_cmake_list(helpers.findFile(root, 'src/CMakeLists.txt'))

	source = []
	for module in modules:
	source.append(env.Object(modules[module]))

	return source

	def minizipLibrary(env):
	return env.SConscript('libs/zip/SConscript', exports = ['env'])

	def gmeLibrary(env):
	use = env
	return SConscript('libs/gme/SConscript', exports = ['use'])

	def lzmaLibrary7z(env):
	use = env
	return SConscript('libs/7z/SConscript', exports = ['use', 'root'])

	def sflLibrary(env):
	use = env
	return SConscript('libs/sfl/SConscript', exports = ['use'])

	def pcreLibrary(env):
	pcreEnv = env.Clone()
	env = pcreEnv
	return env.SConscript('libs/pcre/SConstruct', exports = ['env'])

	def dumbLibrary(env):
	dumbEnv = env.Clone()
	env = dumbEnv
	return env.SConscript('libs/dumb/SConscript', exports = ['env'])

	def hawknlLibrary(env):
	hawkEnv = env.Clone()
	env = hawkEnv
	# if isOSX():
	# env.Append(CPPDEFINES = 'MACOSX')
	return env.SConscript('libs/hawknl/SConscript', exports = ['env'])
	+
	+def lz4Library(env):
	+ lz4Env = env.Clone()
	+ env = lz4Env
	+ return env.SConscript('libs/lz4/SConscript', exports = ['env'])

	env.Append(CPPPATH = Dir('src', Dir(Dir('.').rel_path(Dir('#%s' % root)))).abspath)

	-all = [utilLibrary(env), minizipLibrary(env), gmeLibrary(env), lzmaLibrary7z(env), sflLibrary(env), pcreLibrary(env), dumbLibrary(env)]
	+all = [utilLibrary(env), minizipLibrary(env), gmeLibrary(env), lzmaLibrary7z(env), sflLibrary(env), pcreLibrary(env), dumbLibrary(env), lz4Library(env)]

	if useNetwork(options):
	+ # Have networking
	+ env.Append(CPPDEFINES = ['HAVE_NETWORKING'])
	all.append(hawknlLibrary(env))

	Return('all')
	diff --git a/src/libs/7z/CMakeLists.txt b/src/libs/7z/CMakeLists.txt
	index c6db7f5a..eb336066 100644
	--- a/src/libs/7z/CMakeLists.txt
	+++ b/src/libs/7z/CMakeLists.txt
	@@ -1,38 +1,43 @@
	# -------------------------------------------------------
	# util cmake build script for r-tech1.
	# Written by: juvinious
	# Modified by: kazzmir
	# -------------------------------------------------------

	project (x7z C CXX)

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	set(x7Z_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/7zAlloc.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zBuf.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zBuf2.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zCrc.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zCrcOpt.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zDec.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zIn.c
	${CMAKE_CURRENT_SOURCE_DIR}/CpuArch.c
	${CMAKE_CURRENT_SOURCE_DIR}/LzmaDec.c
	${CMAKE_CURRENT_SOURCE_DIR}/Lzma2Dec.c
	${CMAKE_CURRENT_SOURCE_DIR}/Bra.c
	${CMAKE_CURRENT_SOURCE_DIR}/Bra86.c
	${CMAKE_CURRENT_SOURCE_DIR}/Bcj2.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zFile.c
	${CMAKE_CURRENT_SOURCE_DIR}/7zStream.c
	PARENT_SCOPE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	#include_directories(include include/internal)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (x7z_module ${x7Z_SRC})
	+
	+
	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/7z)
	diff --git a/src/libs/dumb/CMakeLists.txt b/src/libs/dumb/CMakeLists.txt
	index 2763cd97..c8435eb9 100644
	--- a/src/libs/dumb/CMakeLists.txt
	+++ b/src/libs/dumb/CMakeLists.txt
	@@ -1,96 +1,99 @@
	# -------------------------------------------------------
	# dumb cmake build script for r-tech1.
	# Written by: juvinious
	# -------------------------------------------------------
	project (dumb C)
	# -------------------------------------------------------
	# Set some specific stuff for dumb
	# -------------------------------------------------------
	if(NOT MSVC)
	set(CFLAGS "-W -O2 -Wwrite-strings -Wstrict-prototypes -Wall -funroll-loops -Wmissing-declarations -fomit-frame-pointer -Wno-missing-declarations")
	else(NOT MSVC)
	set(CFLAGS "-O2")
	endif(NOT MSVC)

	remove_definitions(${CXXFLAGS})
	add_definitions(${CFLAGS})

	if(MSVC)
	add_definitions("/DDUMB_DECLARE_DEPRECATED")
	else(MSVC)
	add_definitions(-DDUMB_DECLARE_DEPRECATED)
	endif(MSVC)

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	set(DUMB_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itorder.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/xmeffect.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itrender.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itread2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itunload.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loadmod.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loads3m.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loadxm2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itload2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/readmod2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/reads3m2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loadmod2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loadxm.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/loads3m2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itload.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itmisc.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/itread.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/readxm.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/readmod.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/reads3m.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/it/readxm2.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/makeduh.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/unload.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/loadduh.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/rawsig.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/rendduh.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/rendsig.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/duhlen.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/duhtag.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/atexit.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/readduh.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/register.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/core/dumbfile.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/sampbuf.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/stdfile.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/resample.inc
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/clickrem.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/silence.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/resamp2.inc
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/resamp3.inc
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/memfile.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/helpers/resample.c
	PARENT_SCOPE)

	set(UNUSED_DUMB_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datit.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datxm.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datduh.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datitq.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datmod.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/dats3m.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datxmq.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datmodq.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/dats3mq.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/datunld.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/alplay.c
	${CMAKE_CURRENT_SOURCE_DIR}/src/allegro/packfile.c
	PARENT_SCOPE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	include_directories(include include/internal)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (dumb_module ${DUMB_SRC})

	+# Install
	+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include DESTINATION include/r-tech1/libs/dumb)
	+
	diff --git a/src/libs/gme/CMakeLists.txt b/src/libs/gme/CMakeLists.txt
	index 9b6f8c4a..25044805 100644
	--- a/src/libs/gme/CMakeLists.txt
	+++ b/src/libs/gme/CMakeLists.txt
	@@ -1,63 +1,68 @@
	# -------------------------------------------------------
	# GME cmake build script for r-tech1.
	# Written by: juvinious
	# -------------------------------------------------------
	project (gme C CXX)

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	# GME Library
	set(GME_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/Ay_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Ay_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Ay_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Blip_Buffer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Classic_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Data_Reader.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Dual_Resampler.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Effects_Buffer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Fir_Resampler.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gb_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gb_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gb_Oscs.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gbs_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/gme.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gme_File.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Gym_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Hes_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Hes_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Hes_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Kss_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Kss_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Kss_Scc_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/M3u_Playlist.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Multi_Buffer.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Music_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Fme7_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Namco_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Oscs.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nes_Vrc6_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nsfe_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Nsf_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Sap_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Sap_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Sap_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Sms_Apu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Snes_Spc.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Spc_Cpu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Spc_Dsp.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Spc_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Spc_Filter.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Vgm_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Vgm_Emu_Impl.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Ym2413_Emu.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/Ym2612_Emu.cpp
	PARENT_SCOPE)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (gme_module ${GME_SRC})
	+
	+
	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/gme)
	diff --git a/src/libs/hawknl/CMakeLists.txt b/src/libs/hawknl/CMakeLists.txt
	index a05fc114..d3c84d0b 100644
	--- a/src/libs/hawknl/CMakeLists.txt
	+++ b/src/libs/hawknl/CMakeLists.txt
	@@ -1,46 +1,48 @@
	# -------------------------------------------------------
	# hawknl cmake build script for r-tech1.
	# Written by: juvinious
	# -------------------------------------------------------
	project (hawknl C CXX)
	# -------------------------------------------------------
	# Set some specific stuff for hawknl
	# -------------------------------------------------------
	if(NOT MSVC)
	set(CFLAGS "-W -O2 -Wwrite-strings -Wstrict-prototypes -Wall -funroll-loops -Wmissing-declarations -fomit-frame-pointer -Wno-missing-declarations")
	else(NOT MSVC)
	set(CFLAGS "-O2")
	endif(NOT MSVC)

	remove_definitions(${CXXFLAGS})
	add_definitions(${CFLAGS})

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	set(HAWKNL_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/src/crc.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/err.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/errorstr.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/group.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/ipx.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/loopback.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/nl.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/nltime.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/src/sock.cpp
	PARENT_SCOPE)

	#${CMAKE_CURRENT_SOURCE_DIR}/src/htcondition.cpp
	#${CMAKE_CURRENT_SOURCE_DIR}/src/hthread.cpp
	#${CMAKE_CURRENT_SOURCE_DIR}/src/htmutex.cpp

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	#include_directories(include hawknl)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (hawknl_module ${HAWKNL_SRC})

	+# Install
	+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hawknl DESTINATION include/r-tech1/libs/hawknl)
	diff --git a/src/libs/hawknl/SConscript b/src/libs/hawknl/SConscript
	index b12903c3..b24f7d24 100644
	--- a/src/libs/hawknl/SConscript
	+++ b/src/libs/hawknl/SConscript
	@@ -1,27 +1,27 @@
	import os
	Import( 'env' )

	# env = Environment( ENV = os.environ )

	source = Split("""
	src/crc.cpp
	src/err.cpp
	src/errorstr.cpp
	src/group.cpp
	src/ipx.cpp
	src/loopback.cpp
	src/nl.cpp
	src/nltime.cpp
	src/sock.cpp
	""");

	# src/hthread.cpp
	# src/htcondition.cpp
	# src/htmutex.cpp

	-# env.Append(CPPPATH = 'hawknl')
	+env.Append(CPPPATH = ['.', 'hawknl'])

	x = []
	for s in source:
	x.append(env.Object(s))
	Return('x')
	diff --git a/src/libs/lz4/CMakeLists.txt b/src/libs/lz4/CMakeLists.txt
	new file mode 100644
	index 00000000..6d92fd54
	--- /dev/null
	+++ b/src/libs/lz4/CMakeLists.txt
	@@ -0,0 +1,16 @@
	+# -------------------------------------------------------
	+# lz4 cmake build script for r-tech1.
	+# -------------------------------------------------------
	+
	+project (lz4 C CXX)
	+
	+# -------------------------------------------------------
	+# Source directories containing all the necessary .c files
	+# -------------------------------------------------------
	+set(LZ4_SRC
	+${CMAKE_CURRENT_SOURCE_DIR}/lz4.c
	+PARENT_SCOPE)
	+
	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/lz4)
	diff --git a/src/libs/lz4/SConscript b/src/libs/lz4/SConscript
	new file mode 100644
	index 00000000..32711a38
	--- /dev/null
	+++ b/src/libs/lz4/SConscript
	@@ -0,0 +1,10 @@
	+Import('env')
	+
	+source = Split("""
	+lz4.c
	+""")
	+
	+x = []
	+for s in source:
	+ x.append(env.Object(s))
	+Return('x')
	diff --git a/src/libs/pcre/CMakeLists.txt b/src/libs/pcre/CMakeLists.txt
	index 376e350b..96a05928 100644
	--- a/src/libs/pcre/CMakeLists.txt
	+++ b/src/libs/pcre/CMakeLists.txt
	@@ -1,38 +1,42 @@
	# -------------------------------------------------------
	# PCRE cmake build script for r-tech1.
	# Written by: juvinious
	# -------------------------------------------------------
	project (pcre C CXX)

	# -------------------------------------------------------
	# Source directories containing all the necessary .c files
	# -------------------------------------------------------
	# PCRE Library
	set(PCRE_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_chartables.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_compile.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_config.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_dfa_exec.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_exec.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_fullinfo.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_get.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_globals.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_info.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_maketables.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_newline.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_ord2utf8.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcreposix.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_refcount.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_study.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_tables.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_try_flipped.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_ucd.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_valid_utf8.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_version.c
	${CMAKE_CURRENT_SOURCE_DIR}/pcre_xclass.c
	PARENT_SCOPE)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (pcre_module ${PCRE_SRC})
	+
	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/pcre)
	diff --git a/src/libs/sfl/CMakeLists.txt b/src/libs/sfl/CMakeLists.txt
	index d2a53101..c253f28b 100644
	--- a/src/libs/sfl/CMakeLists.txt
	+++ b/src/libs/sfl/CMakeLists.txt
	@@ -1,75 +1,80 @@
	# -------------------------------------------------------
	# SFL cmake build script for r-tech1.
	# Written by: juvinious
	# -------------------------------------------------------
	project (sfl C)
	# -------------------------------------------------------
	# Set some specific stuff for hawknl
	# -------------------------------------------------------
	if(NOT MSVC)
	set(CFLAGS "-W -O2 -Wwrite-strings -Wstrict-prototypes -Wall -funroll-loops -Wmissing-declarations -fomit-frame-pointer -Wno-missing-declarations")
	else(NOT MSVC)
	set(CFLAGS "-O2")
	endif(NOT MSVC)

	remove_definitions(${CXXFLAGS})
	add_definitions(${CFLAGS})

	# -------------------------------------------------------
	# Source directories containing all the necessary .cpp files
	# -------------------------------------------------------
	set(SFL_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/sflbits.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcomp.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcons.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflconv.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcryp.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvbs.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvdp.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvds.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvns.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvsb.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvsd.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvsn.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvtp.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflcvts.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfldbio.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfldir.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflenv.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflexdr.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflfile.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflfind.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflfort.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflhttp.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflini.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfllang.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfllbuf.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfllist.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflmath.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflmem.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflmesg.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflmime.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflnode.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflprint.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflslot.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflstr.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflsymb.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflsyst.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfltok.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfltree.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfltron.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfluid.c
	${CMAKE_CURRENT_SOURCE_DIR}/sflxml.c
	${CMAKE_CURRENT_SOURCE_DIR}/sfldate.c
	PARENT_SCOPE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	include_directories(include ./)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (sfl_module ${SFL_SRC})

	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/sfl)
	+
	+
	diff --git a/src/libs/zip/CMakeLists.txt b/src/libs/zip/CMakeLists.txt
	index d0445c5e..6ce67bc3 100644
	--- a/src/libs/zip/CMakeLists.txt
	+++ b/src/libs/zip/CMakeLists.txt
	@@ -1,16 +1,20 @@
	project(minizip C)

	set(MINIZIP_SRC
	${CMAKE_CURRENT_SOURCE_DIR}/ioapi.c
	${CMAKE_CURRENT_SOURCE_DIR}/unzip.c
	${CMAKE_CURRENT_SOURCE_DIR}/zip.c PARENT_SCOPE)

	# -------------------------------------------------------
	# Include directory
	# -------------------------------------------------------
	# include_directories(include include/internal)

	# -------------------------------------------------------
	# module
	# -------------------------------------------------------
	#add_library (minizip_module ${MINIZIP_SRC})
	+
	+# Install
	+file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
	+INSTALL(FILES ${files} DESTINATION include/r-tech1/libs/zip)

File Metadata

Mime Type: text/x-diff
Expires: Thu, May 14, 11:39 PM (1 d, 6 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 63665
Default Alt Text: (45 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions