Merge branch 'master' of http://git.kingsome.cn/server_common/framework

cpp/dynmodule.cc

@@ -1,4 +1,4 @@
-#include "dynmodule.h"
+#include "framework/cpp/dynmodule.h"
 
 DynModule::DynModule()
 {

cpp/netmsghandler.cc

@@ -3,8 +3,8 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/descriptor.h>
 
-#include "protoutils.h"
-#include "netmsghandler.h"
+#include "framework/cpp/protoutils.h"
+#include "framework/cpp/netmsghandler.h"
 
 NetMsgHandler* GetNetMsgHandler(NetMsgHandlerObject* handlers,
                                 unsigned short msgid)

cpp/protoutils.cc

@@ -1,6 +1,6 @@
 #include <a8/a8.h>
 
-#include "protoutils.h"
+#include "framework/cpp/protoutils.h"
 
 #include <a8/tcpclient.h>
 #include <a8/tcplistener.h>

cpp/tiledmap.cc

@@ -1,6 +1,6 @@
 #include <a8/a8.h>
 
-#include "tiledmap.h"
+#include "framework/cpp/tiledmap.h"
 
 a8::XValue TiledObject::GetProperty(const std::string& prop_name)
 {

cpp/utils.cc

@@ -5,7 +5,7 @@
 
 #include <google/protobuf/message.h>
 
-#include "utils.h"
+#include "framework/cpp/utils.h"
 
 
 bool ReadCsvMetaFile(const std::string& filename,