Bladeren bron

同步主干代码,修改冲突的代码

chensongchao 6 jaren geleden
bovenliggende
commit
3684eac2ea
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      db/Makefile.am

+ 1 - 1
db/Makefile.am

@@ -4,7 +4,7 @@ noinst_LIBRARIES=libyadb.a
 
 
 CXXFLAGS=-fPIC -g
-AM_CPPFLAGS=-Wall -pthread -m64 -std=c++11  -I${prefix}/include -I/usr/local/mysql/include -I. -I.. -I../websocket/sio
+AM_CPPFLAGS=-Wall -pthread -m64 -std=c++11  -I${prefix}/include -I../../dist/include -I../../rapidjson/include -I/usr/local/mysql/include -I. -I.. -I../websocket/sio
 AM_LDFLAGS =-Wall -pthread -m64 -std=c++11  -L${prefix}/lib  -L/usr/local/mysql/lib
 
 libyadb_a_SOURCES= db_card.cpp db_api/CDBResultSet.cpp db_api/CDBConnect.cpp \