first try to make it can be compiled

SiNZeRo · SiNZeRo · commit e73e474cb529 · 2016-04-13T17:09:49.000+08:00
diff --git a/Makefile b/Makefile
@@ -0,0 +1,3 @@
+all:
+	$(MAKE) -C apis/CTP all                                                       
+	$(MAKE) -C tests/CPP all                                                       
diff --git a/apis/CTP/Makefile b/apis/CTP/Makefile
@@ -0,0 +1,26 @@
+CXX=clang
+IFLAGS=-I../../ -I../../include/ -I../ -I./ 
+CFLAGS=$(IFLAGS)-std=c++11 -fPIC
+
+DEPS=../../../XAPI2/languages/CPP/XAPI_CPP/XApiImpl.o \
+	 ../../../XAPI2/languages/CPP/XAPI_CPP/XApiCpp.o \
+	 ../../../XAPI2/languages/CPP/XAPI_CPP/XApiC.o \
+	 ../../include/toolkit.o
+
+DEPS+=../../common/Queue/MsgQueue.o \
+	  ../../common/Queue/RemoteQueue.o \
+      ../../include/ApiProcess.o
+
+LFLAGS=-ldl -L../../include/CTP/linux64 -lthosttraderapi -lthostmduserapi 
+all: ctp_quote.so ctp_trade.so 
+
+%.o: %.cpp 
+	$(CXX) $(CFLAGS) -c $^ -o $@
+
+ctp_quote.so: Quote/main.cpp Quote/MdUserApi.cpp TypeConvert.cpp $(DEPS)
+	$(CXX) --shared $(IFLAGS) $(CFLAGS) -I../CTP_Quote -o $@ $^
+
+ctp_trade.so: Trade/main.cpp Trade/TraderApi.cpp TypeConvert.cpp $(DEPS)
+	$(CXX) --shared $(IFLAGS) $(CFLAGS) -I../CTP_Trade -o $@ $^
+
+
diff --git a/apis/CTP/Trade/TraderApi.cpp b/apis/CTP/Trade/TraderApi.cpp
@@ -18,7 +18,9 @@
 #include <cstring>
 #include <assert.h>
 #include <cfloat>
+#if defined(_MSC_VER) || defined(_WIN32)
 #include <direct.h>
+#endif
 
 #ifdef ENABLE_LICENSE
 #include "../../common/License/License.h"
@@ -1499,7 +1501,7 @@ int CTraderApi::_ReqQrySettlementInfo(char type, void* pApi1, void* pApi2, doubl
 	CThostFtdcQrySettlementInfoField body = { 0 };
 	strncpy(body.BrokerID, m_RspUserLogin.BrokerID, sizeof(TThostFtdcBrokerIDType));
 	strncpy(body.InvestorID, m_RspUserLogin.UserID, sizeof(TThostFtdcInvestorIDType));
-	sprintf_s(body.TradingDay, "%d", pQuery->DateStart);
+	sprintf(body.TradingDay, "%d", pQuery->DateStart);
 
 	return m_pApi->ReqQrySettlementInfo(&body, ++m_lRequestID);
 }
diff --git a/apis/CTP/TypeConvert.cpp b/apis/CTP/TypeConvert.cpp
@@ -1,6 +1,6 @@
 ﻿#include "stdafx.h"
 #include "TypeConvert.h"
-
+#include <cstring>
 #include <stdio.h>
 
 
@@ -352,4 +352,4 @@ void CThostFtdcOrderField_2_OrderField_0(OrderIDType OrderID,CThostFtdcOrderFiel
 	pOut->ExecType = CThostFtdcOrderField_2_ExecType(pIn);
 	strcpy(pOut->OrderID, pIn->OrderSysID);
 	strncpy(pOut->Text, pIn->StatusMsg, sizeof(Char256Type));
-}
+}
diff --git a/include/toolkit.cpp b/include/toolkit.cpp
@@ -470,6 +470,7 @@ void GetOnFrontDisconnectedMsg(int ErrorId, char* ErrorMsg)
 	}
 }
 
+#if defined _WIN32 || WIN32 || _WINDOWS
 void GetDllPathByFunctionName(const char* szFunctionName, char* szPath)
 {
 	HMODULE hModule = nullptr;
@@ -508,3 +509,4 @@ void GetNewPathInSameDirectory(const char* szPath, const char* szFname, const ch
 	_splitpath(szPath, drive, dir, fname, ext);
 	_makepath(szFileName, drive, dir, szFname, szExt);
 }
+#endif
diff --git a/languages/CPP/XAPI_CPP/XApiC.cpp b/languages/CPP/XAPI_CPP/XApiC.cpp
@@ -109,7 +109,7 @@ void X_Register(void* pFun, void* pApi, fnOnRespone pCallback, void* pClass)
 	if (pFun == nullptr || pApi == nullptr)
 		return;
 
-	((fnOnRespone)pFun)(RequestType::RequestType_Register, pApi, nullptr, 0, 0, pCallback, 0, pClass, 0, nullptr, 0);
+	((fnOnRespone)pFun)(RequestType::RequestType_Register, pApi, nullptr, 0, 0, (void*)pCallback, 0, pClass, 0, nullptr, 0);
 }
 
 void X_Connect(void* pFun, void* pApi, const char* szPath, ServerInfoField* pServerInfo, UserInfoField* pUserInfo, int count)
diff --git a/tests/CPP/Makefile b/tests/CPP/Makefile
@@ -0,0 +1,31 @@
+CXX=clang++
+C=clang
+IFLAGS=-I../../ -I../../include/ -I../ -I./ 
+CFLAGS=$(IFLAGS)-std=c++11 -fPIC -pthread -g 
+DEPS=../../languages/CPP/XAPI_CPP/XApiImpl.o \
+	 ../../languages/CPP/XAPI_CPP/XApiCpp.o \
+	 ../../languages/CPP/XAPI_CPP/XApiC.o \
+	 ../../include/toolkit.o
+
+DEPS+=../../common/Queue/MsgQueue.o \
+	  ../../common/Queue/RemoteQueue.o \
+      ../../include/ApiProcess.o
+
+LFLAGS=-ldl -L../../include/CTP/linux64 -lthosttraderapi -lthostmduserapi
+
+all: CPP_TEST libQuantBox_CTP_Quote.so libQuantBox_CTP_Trade.so 
+
+%.o: %.cpp 
+	$(CXX) $(CFLAGS) -c $^ -o $@
+
+libQuantBox_CTP_Quote.so libQuantBox_CTP_Trade.so:
+	ln -s ../../apis/CTP/ctp_quote.so libQuantBox_CTP_Quote.so
+	ln -s ../../apis/CTP/ctp_trade.so libQuantBox_CTP_Trade.so
+	ln -s ../../include/CTP/linux64/libthosttraderapi.so
+	ln -s ../../include/CTP/linux64/libthostmduserapi.so
+
+CPP_TEST: CPP_TEST.o $(DEPS)
+	$(CXX)  $(IFLAGS) $(CFLAGS) $(LFLAGS) -I../CTP_Trade -o $@ $^
+
+clean:
+	rm $(DEPS) *.o

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+all:`
	`2`	`+ $(MAKE) -C apis/CTP all`
	`3`	`+ $(MAKE) -C tests/CPP all`
Original file line number	Diff line number	Diff line change
`@@ -470,6 +470,7 @@ void GetOnFrontDisconnectedMsg(int ErrorId, char* ErrorMsg)`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`
	`473`	`+#if defined _WIN32 \|\| WIN32 \|\| _WINDOWS`
`473`	`474`	`void GetDllPathByFunctionName(const char* szFunctionName, char* szPath)`
`474`	`475`	`{`
`475`	`476`	`HMODULE hModule = nullptr;`
`@@ -508,3 +509,4 @@ void GetNewPathInSameDirectory(const char* szPath, const char* szFname, const ch`
`508`	`509`	`_splitpath(szPath, drive, dir, fname, ext);`
`509`	`510`	`_makepath(szFileName, drive, dir, szFname, szExt);`
`510`	`511`	`}`
	`512`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void X_Register(void* pFun, void* pApi, fnOnRespone pCallback, void* pClass)`
`109`	`109`	`if (pFun == nullptr \|\| pApi == nullptr)`
`110`	`110`	`return;`
`111`	`111`
`112`		`- ((fnOnRespone)pFun)(RequestType::RequestType_Register, pApi, nullptr, 0, 0, pCallback, 0, pClass, 0, nullptr, 0);`
	`112`	`+ ((fnOnRespone)pFun)(RequestType::RequestType_Register, pApi, nullptr, 0, 0, (void*)pCallback, 0, pClass, 0, nullptr, 0);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`void X_Connect(void* pFun, void* pApi, const char* szPath, ServerInfoField* pServerInfo, UserInfoField* pUserInfo, int count)`