Commit f6684569 authored by Mark Frohnmayer's avatar Mark Frohnmayer
Browse files

updated tnl2 to reflect new torque_sockets directory layout

parent f53c5034

tnl2_test/Makefile

+3 −3
Original line number Diff line number Diff line 
#############################################################################

# Makefile for building: tnl2_test.app/Contents/MacOS/tnl2_test

# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat Mar 13 08:11:49 2010

# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat Mar 13 13:05:17 2010

# Project:  tnl2_test.pro

# Template: app

# Command: /usr/bin/qmake -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile tnl2_test.pro
@@ -13,7 +13,7 @@ CXX = g++ 
DEFINES       = -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED

CFLAGS        = -pipe -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)

CXXFLAGS      = -pipe -g -gdwarf-2 -arch i386 -Wall -W $(DEFINES)

INCPATH       = -I/usr/local/Qt4.6/mkspecs/macx-g++ -I. -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/usr/include/QtCore -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/usr/include/QtGui -I/Library/Frameworks/QtOpenGL.framework/Versions/4/Headers -I/usr/include/QtOpenGL -I/usr/include -I../tnl2 -I../../torque_sockets/platform_library -I../../torque_sockets/lib/libtomcrypt/src/headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/System/Library/Frameworks/AGL.framework/Headers -I. -F/Library/Frameworks

INCPATH       = -I/usr/local/Qt4.6/mkspecs/macx-g++ -I. -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/usr/include/QtCore -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/usr/include/QtGui -I/Library/Frameworks/QtOpenGL.framework/Versions/4/Headers -I/usr/include/QtOpenGL -I/usr/include -I../tnl2 -I../../torque_sockets -I../../torque_sockets/lib/libtomcrypt/src/headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/System/Library/Frameworks/AGL.framework/Headers -I. -F/Library/Frameworks

LINK          = g++

LFLAGS        = -headerpad_max_install_names -arch i386

LIBS          = $(SUBLIBS) -F/Library/Frameworks -L/Library/Frameworks -L../../torque_sockets/lib/libtomcrypt -L../../torque_sockets/lib/libtommath -ltomcrypt -ltommath -framework CoreServices -framework QtOpenGL -framework QtGui -framework QtCore -framework OpenGL -framework AGL
@@ -203,7 +203,7 @@ tnl2_test.app/Contents/Info.plist: 
	@sed -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tnl2_test,g" -e "s,@TYPEINFO@,????,g" /usr/local/Qt4.6/mkspecs/macx-g++/Info.plist.app >tnl2_test.app/Contents/Info.plist

dist: 

	@$(CHK_DIR_EXISTS) .tmp/tnl2_test1.0.0 || $(MKDIR) .tmp/tnl2_test1.0.0 

	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents tnl2_test_widget.h test_player.h test_net_interface.h test_game.h test_connection.h test_building.h ../../torque_sockets/platform_library/core/zone_allocator.h ../../torque_sockets/platform_library/core/utils.h ../../torque_sockets/platform_library/core/type_record.h ../../torque_sockets/platform_library/core/type_database.h ../../torque_sockets/platform_library/core/thread_queue.h ../../torque_sockets/platform_library/core/thread.h ../../torque_sockets/platform_library/core/string.h ../../torque_sockets/platform_library/core/static_to_indexed_string_map.h ../../torque_sockets/platform_library/core/small_block_allocator.h ../../torque_sockets/platform_library/core/ref_object.h ../../torque_sockets/platform_library/core/power_two_functions.h ../../torque_sockets/platform_library/core/page_allocator.h ../../torque_sockets/platform_library/core/memory_functions.h ../../torque_sockets/platform_library/core/log.h ../../torque_sockets/platform_library/core/indexed_string.h ../../torque_sockets/platform_library/core/hash_table_flat.h ../../torque_sockets/platform_library/core/hash_table_array.h ../../torque_sockets/platform_library/core/hash.h ../../torque_sockets/platform_library/core/functor.h ../../torque_sockets/platform_library/core/function_record.h ../../torque_sockets/platform_library/core/formatted_string_buffer.h ../../torque_sockets/platform_library/core/dictionary.h ../../torque_sockets/platform_library/core/cpu_endian.h ../../torque_sockets/platform_library/core/core.h ../../torque_sockets/platform_library/core/context.h ../../torque_sockets/platform_library/core/construct.h ../../torque_sockets/platform_library/core/byte_stream_fixed.h ../../torque_sockets/platform_library/core/byte_buffer.h ../../torque_sockets/platform_library/core/bit_stream.h ../../torque_sockets/platform_library/core/base_types.h ../../torque_sockets/platform_library/core/base_type_traits.h ../../torque_sockets/platform_library/core/base_type_io.h ../../torque_sockets/platform_library/core/base_type_declarations.h ../../torque_sockets/platform_library/core/assert.h ../../torque_sockets/platform_library/core/array.h ../../torque_sockets/platform_library/core/algorithm_templates.h ../../torque_sockets/platform_library/net/udp_socket.h ../../torque_sockets/platform_library/net/time.h ../../torque_sockets/platform_library/net/symmetric_cipher.h ../../torque_sockets/platform_library/net/sockets.h ../../torque_sockets/platform_library/net/random_generator.h ../../torque_sockets/platform_library/net/packet_stream.h ../../torque_sockets/platform_library/net/nonce.h ../../torque_sockets/platform_library/net/net.h ../../torque_sockets/platform_library/net/interface.h ../../torque_sockets/platform_library/net/connection.h ../../torque_sockets/platform_library/net/client_puzzle.h ../../torque_sockets/platform_library/net/buffer_utils.h ../../torque_sockets/platform_library/net/asymmetric_key.h ../../torque_sockets/platform_library/net/address.h ../../torque_sockets/platform_library/platform/system_includes_win32.h ../../torque_sockets/platform_library/platform/system_includes_mac_osx.h ../../torque_sockets/platform_library/platform/system_includes_linux.h ../../torque_sockets/platform_library/platform/platform.h ../../torque_sockets/platform_library/torque_sockets_implementation.h ../tnl2/tnl2.h ../tnl2/net_object.h ../tnl2/net_interface.h ../tnl2/net_connection.h ../tnl2/ghost_connection.h ../tnl2/exceptions.h ../tnl2/event_connection.h window.h ../../torque_sockets/platform_library/net/torque_socket.h ../../torque_sockets/platform_library/net/torque_connection.h .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents main.cpp tnl2_test_widget.cpp test_game.cpp window.cpp .tmp/tnl2_test1.0.0/ && (cd `dirname .tmp/tnl2_test1.0.0` && $(TAR) tnl2_test1.0.0.tar tnl2_test1.0.0 && $(COMPRESS) tnl2_test1.0.0.tar) && $(MOVE) `dirname .tmp/tnl2_test1.0.0`/tnl2_test1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tnl2_test1.0.0

	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents tnl2_test_widget.h test_player.h test_net_interface.h test_game.h test_connection.h test_building.h ../tnl2/tnl2.h ../tnl2/net_object.h ../tnl2/net_interface.h ../tnl2/net_connection.h ../tnl2/ghost_connection.h ../tnl2/exceptions.h ../tnl2/event_connection.h window.h ../../torque_sockets/core/zone_allocator.h ../../torque_sockets/core/utils.h ../../torque_sockets/core/type_record.h ../../torque_sockets/core/type_database.h ../../torque_sockets/core/thread_queue.h ../../torque_sockets/core/thread.h ../../torque_sockets/core/system_includes_win32.h ../../torque_sockets/core/system_includes_mac_osx.h ../../torque_sockets/core/system_includes_linux.h ../../torque_sockets/core/string.h ../../torque_sockets/core/static_to_indexed_string_map.h ../../torque_sockets/core/small_block_allocator.h ../../torque_sockets/core/ref_object.h ../../torque_sockets/core/power_two_functions.h ../../torque_sockets/core/platform.h ../../torque_sockets/core/page_allocator.h ../../torque_sockets/core/memory_functions.h ../../torque_sockets/core/log.h ../../torque_sockets/core/indexed_string.h ../../torque_sockets/core/hash_table_flat.h ../../torque_sockets/core/hash_table_array.h ../../torque_sockets/core/hash.h ../../torque_sockets/core/functor.h ../../torque_sockets/core/function_record.h ../../torque_sockets/core/formatted_string_buffer.h ../../torque_sockets/core/dictionary.h ../../torque_sockets/core/cpu_endian.h ../../torque_sockets/core/core.h ../../torque_sockets/core/context.h ../../torque_sockets/core/construct.h ../../torque_sockets/core/byte_stream_fixed.h ../../torque_sockets/core/byte_buffer.h ../../torque_sockets/core/bit_stream.h ../../torque_sockets/core/base_types.h ../../torque_sockets/core/base_type_traits.h ../../torque_sockets/core/base_type_io.h ../../torque_sockets/core/base_type_declarations.h ../../torque_sockets/core/assert.h ../../torque_sockets/core/array.h ../../torque_sockets/core/algorithm_templates.h ../../torque_sockets/torque_sockets/udp_socket.h ../../torque_sockets/torque_sockets/torque_sockets.h ../../torque_sockets/torque_sockets/torque_socket_event.h ../../torque_sockets/torque_sockets/torque_socket.h ../../torque_sockets/torque_sockets/torque_connection.h ../../torque_sockets/torque_sockets/time.h ../../torque_sockets/torque_sockets/symmetric_cipher.h ../../torque_sockets/torque_sockets/sockets.h ../../torque_sockets/torque_sockets/random_generator.h ../../torque_sockets/torque_sockets/packet_stream.h ../../torque_sockets/torque_sockets/nonce.h ../../torque_sockets/torque_sockets/client_puzzle.h ../../torque_sockets/torque_sockets/buffer_utils.h ../../torque_sockets/torque_sockets/asymmetric_key.h ../../torque_sockets/torque_sockets/address.h .tmp/tnl2_test1.0.0/ && $(COPY_FILE) --parents main.cpp tnl2_test_widget.cpp test_game.cpp window.cpp .tmp/tnl2_test1.0.0/ && (cd `dirname .tmp/tnl2_test1.0.0` && $(TAR) tnl2_test1.0.0.tar tnl2_test1.0.0 && $(COMPRESS) tnl2_test1.0.0.tar) && $(MOVE) `dirname .tmp/tnl2_test1.0.0`/tnl2_test1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tnl2_test1.0.0





clean:compiler_clean

tnl2_test/test_game.cpp

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
// Copyright GarageGames.  See /license/info.txt in this distribution for licensing terms.



#include "tomcrypt.h"

#include "platform/platform.h"

#include "torque_socket_event.h"

#include "core/platform.h"

#include "torque_sockets/torque_socket_event.h"



namespace core

{
@@ -41,7 +41,7 @@ namespace core 
		return hash_buffer((void *) &the_method, sizeof(the_method));

	}

	struct net {

		#include "net/net.h"

		#include "torque_sockets/torque_sockets.h"

	};

};

tnl2_test/tnl2_test.pro

+56 −58
Original line number Diff line number Diff line
@@ -14,61 +14,6 @@ HEADERS += tnl2_test_widget.h \ 
    test_game.h \

    test_connection.h \

    test_building.h \

    ../../torque_sockets/platform_library/core/zone_allocator.h \

    ../../torque_sockets/platform_library/core/utils.h \

    ../../torque_sockets/platform_library/core/type_record.h \

    ../../torque_sockets/platform_library/core/type_database.h \

    ../../torque_sockets/platform_library/core/thread_queue.h \

    ../../torque_sockets/platform_library/core/thread.h \

    ../../torque_sockets/platform_library/core/string.h \

    ../../torque_sockets/platform_library/core/static_to_indexed_string_map.h \

    ../../torque_sockets/platform_library/core/small_block_allocator.h \

    ../../torque_sockets/platform_library/core/ref_object.h \

    ../../torque_sockets/platform_library/core/power_two_functions.h \

    ../../torque_sockets/platform_library/core/page_allocator.h \

    ../../torque_sockets/platform_library/core/memory_functions.h \

    ../../torque_sockets/platform_library/core/log.h \

    ../../torque_sockets/platform_library/core/indexed_string.h \

    ../../torque_sockets/platform_library/core/hash_table_flat.h \

    ../../torque_sockets/platform_library/core/hash_table_array.h \

    ../../torque_sockets/platform_library/core/hash.h \

    ../../torque_sockets/platform_library/core/functor.h \

    ../../torque_sockets/platform_library/core/function_record.h \

    ../../torque_sockets/platform_library/core/formatted_string_buffer.h \

    ../../torque_sockets/platform_library/core/dictionary.h \

    ../../torque_sockets/platform_library/core/cpu_endian.h \

    ../../torque_sockets/platform_library/core/core.h \

    ../../torque_sockets/platform_library/core/context.h \

    ../../torque_sockets/platform_library/core/construct.h \

    ../../torque_sockets/platform_library/core/byte_stream_fixed.h \

    ../../torque_sockets/platform_library/core/byte_buffer.h \

    ../../torque_sockets/platform_library/core/bit_stream.h \

    ../../torque_sockets/platform_library/core/base_types.h \

    ../../torque_sockets/platform_library/core/base_type_traits.h \

    ../../torque_sockets/platform_library/core/base_type_io.h \

    ../../torque_sockets/platform_library/core/base_type_declarations.h \

    ../../torque_sockets/platform_library/core/assert.h \

    ../../torque_sockets/platform_library/core/array.h \

    ../../torque_sockets/platform_library/core/algorithm_templates.h \

    ../../torque_sockets/platform_library/net/udp_socket.h \

    ../../torque_sockets/platform_library/net/time.h \

    ../../torque_sockets/platform_library/net/symmetric_cipher.h \

    ../../torque_sockets/platform_library/net/sockets.h \

    ../../torque_sockets/platform_library/net/random_generator.h \

    ../../torque_sockets/platform_library/net/packet_stream.h \

    ../../torque_sockets/platform_library/net/nonce.h \

    ../../torque_sockets/platform_library/net/net.h \

    ../../torque_sockets/platform_library/net/interface.h \

    ../../torque_sockets/platform_library/net/connection.h \

    ../../torque_sockets/platform_library/net/client_puzzle.h \

    ../../torque_sockets/platform_library/net/buffer_utils.h \

    ../../torque_sockets/platform_library/net/asymmetric_key.h \

    ../../torque_sockets/platform_library/net/address.h \

    ../../torque_sockets/platform_library/platform/system_includes_win32.h \

    ../../torque_sockets/platform_library/platform/system_includes_mac_osx.h \

    ../../torque_sockets/platform_library/platform/system_includes_linux.h \

    ../../torque_sockets/platform_library/platform/platform.h \

    ../../torque_sockets/platform_library/torque_sockets_implementation.h \

    ../tnl2/tnl2.h \

    ../tnl2/net_object.h \

    ../tnl2/net_interface.h \
@@ -77,11 +22,64 @@ HEADERS += tnl2_test_widget.h \ 
    ../tnl2/exceptions.h \

    ../tnl2/event_connection.h \

    window.h \

    ../../torque_sockets/platform_library/net/torque_socket.h \

    ../../torque_sockets/platform_library/net/torque_connection.h

    ../../torque_sockets/core/zone_allocator.h \

    ../../torque_sockets/core/utils.h \

    ../../torque_sockets/core/type_record.h \

    ../../torque_sockets/core/type_database.h \

    ../../torque_sockets/core/thread_queue.h \

    ../../torque_sockets/core/thread.h \

    ../../torque_sockets/core/system_includes_win32.h \

    ../../torque_sockets/core/system_includes_mac_osx.h \

    ../../torque_sockets/core/system_includes_linux.h \

    ../../torque_sockets/core/string.h \

    ../../torque_sockets/core/static_to_indexed_string_map.h \

    ../../torque_sockets/core/small_block_allocator.h \

    ../../torque_sockets/core/ref_object.h \

    ../../torque_sockets/core/power_two_functions.h \

    ../../torque_sockets/core/platform.h \

    ../../torque_sockets/core/page_allocator.h \

    ../../torque_sockets/core/memory_functions.h \

    ../../torque_sockets/core/log.h \

    ../../torque_sockets/core/indexed_string.h \

    ../../torque_sockets/core/hash_table_flat.h \

    ../../torque_sockets/core/hash_table_array.h \

    ../../torque_sockets/core/hash.h \

    ../../torque_sockets/core/functor.h \

    ../../torque_sockets/core/function_record.h \

    ../../torque_sockets/core/formatted_string_buffer.h \

    ../../torque_sockets/core/dictionary.h \

    ../../torque_sockets/core/cpu_endian.h \

    ../../torque_sockets/core/core.h \

    ../../torque_sockets/core/context.h \

    ../../torque_sockets/core/construct.h \

    ../../torque_sockets/core/byte_stream_fixed.h \

    ../../torque_sockets/core/byte_buffer.h \

    ../../torque_sockets/core/bit_stream.h \

    ../../torque_sockets/core/base_types.h \

    ../../torque_sockets/core/base_type_traits.h \

    ../../torque_sockets/core/base_type_io.h \

    ../../torque_sockets/core/base_type_declarations.h \

    ../../torque_sockets/core/assert.h \

    ../../torque_sockets/core/array.h \

    ../../torque_sockets/core/algorithm_templates.h \

    ../../torque_sockets/torque_sockets/udp_socket.h \

    ../../torque_sockets/torque_sockets/torque_sockets.h \

    ../../torque_sockets/torque_sockets/torque_socket_event.h \

    ../../torque_sockets/torque_sockets/torque_socket.h \

    ../../torque_sockets/torque_sockets/torque_connection.h \

    ../../torque_sockets/torque_sockets/time.h \

    ../../torque_sockets/torque_sockets/symmetric_cipher.h \

    ../../torque_sockets/torque_sockets/sockets.h \

    ../../torque_sockets/torque_sockets/random_generator.h \

    ../../torque_sockets/torque_sockets/packet_stream.h \

    ../../torque_sockets/torque_sockets/nonce.h \

    ../../torque_sockets/torque_sockets/client_puzzle.h \

    ../../torque_sockets/torque_sockets/buffer_utils.h \

    ../../torque_sockets/torque_sockets/asymmetric_key.h \

    ../../torque_sockets/torque_sockets/address.h

FORMS += 

INCLUDEPATH += ../tnl2 \

    ../../torque_sockets/platform_library \

	../../torque_sockets/ \

    ../../torque_sockets/lib/libtomcrypt/src/headers

LIBS += -L../../torque_sockets/lib/libtomcrypt \

    -L../../torque_sockets/lib/libtommath \