From 08395fcf3d73c06069639cbbc6cf23d6152d2aee Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 13 May 2013 19:36:16 -0700 Subject: [PATCH] Reorganize VS2012 project and add unity build for websocket --- newcoin.vcxproj | 65 +++- newcoin.vcxproj.filters | 776 +++++++++++++++++++------------------ src/cpp/websocket_core.cpp | 16 + 3 files changed, 458 insertions(+), 399 deletions(-) create mode 100644 src/cpp/websocket_core.cpp diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 2e64251f87..71fbf23255 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -279,23 +279,58 @@ - - - - - - - - - - + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + - + + + + + + + + + @@ -403,13 +438,8 @@ - - - - Designer - @@ -424,6 +454,9 @@ $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc + + + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index aa0aa8cef5..c6277b2014 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -5,51 +5,31 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd + + {475c5b33-c9b5-415f-89df-fb9961f3b57c} - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {54608e0e-4ac4-44d6-af96-0c278457ac6f} - - - {c642219d-cace-47c1-828a-58ba570da63a} - - - {c717b139-5eba-454b-8888-9bf54ce0a652} - - - {77d2a621-b503-4ce4-aee8-ef0b337c4ee2} - - + {60c3631e-8855-4a61-bdd3-9892d96242d5} - - {92775c5f-dc9f-4a97-a9a6-6d4bd4e424b4} + + {c642219d-cace-47c1-828a-58ba570da63a} - + {cd4c41c0-3ee6-49f8-8322-d11422b892f9} + + {a152ed99-bd05-4c37-8ae7-82888b1bb469} + - - Source Files\database - - - Source Files\database - - Source Files\json + [0] Libraries\json - Source Files\json + [0] Libraries\json - Source Files\json + [0] Libraries\json Source Files @@ -295,37 +275,7 @@ Source Files - Source Files\database - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp - - - Source Files\websocketpp + [0] Libraries\SQLite Source Files @@ -383,356 +333,407 @@ + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + [0] Libraries\websocket + + + Source Files + + + Source Files + + + [0] Libraries + - - Header Files\util - - - Header Files\util - - - Header Files\util - - - Header Files\util - - - Header Files\util - - - Header Files\util - - - Header Files\util - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket - Header Files\websocket + [0] Libraries\websocket Source Files + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\SQLite + + + [0] Libraries\SQLite + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + - - html - @@ -741,6 +742,15 @@ + + [0] Libraries\json + + + [0] Libraries\json + + + [0] Libraries\json + diff --git a/src/cpp/websocket_core.cpp b/src/cpp/websocket_core.cpp new file mode 100644 index 0000000000..12217aa782 --- /dev/null +++ b/src/cpp/websocket_core.cpp @@ -0,0 +1,16 @@ + +// Unity build file for websocket +// + +// Must come first to prevent compile errors +#include "websocketpp/src/uri.cpp" + +#include "websocketpp/src/base64/base64.cpp" +#include "websocketpp/src/rng/boost_rng.cpp" +#include "websocketpp/src/messages/data.cpp" +#include "websocketpp/src/processors/hybi_header.cpp" +#include "websocketpp/src/processors/hybi_util.cpp" +#include "websocketpp/src/md5/md5.c" +#include "websocketpp/src/network_utilities.cpp" +#include "websocketpp/src/sha1/sha1.cpp" +