this is closer but still not building correctly

This commit is contained in:
DarthArgus
2016-04-28 03:28:12 +00:00
parent 4f7a729d61
commit 5f7cf7e969
4 changed files with 20 additions and 11 deletions
@@ -118,8 +118,9 @@ add_executable(LoginServer
${PLATFORM_SOURCES}
)
link_directories(${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI)
target_link_libraries(LoginServer
webAPI
sharedCommandParser
sharedCompression
sharedDatabaseInterface
@@ -152,5 +153,6 @@ target_link_libraries(LoginServer
CommonAPI
LoginAPI
MonAPI2
webAPI
${CMAKE_DL_LIBS}
)
@@ -23,7 +23,7 @@
#include "sharedNetworkMessages/GenericValueTypeMessage.h"
#include "sharedNetworkMessages/LoginEnumCluster.h"
#include <webAPI.h>
#include "webAPI.h"
#include <algorithm>
//-----------------------------------------------------------------------
+9 -6
View File
@@ -1,13 +1,16 @@
set(SHARED_SOURCES
webAPI.cpp
cmake_minimum_required(VERSION 2.8)
project(webAPI)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_library(webAPI
webAPI.h
webAPI.cpp
json.hpp
${CURL_LIBRARIES}
)
include_directories(
${CURL_INCLUDE_DIRS}
)
#target_link_libraries(
# ${CURL_LIBRARIES}
#)
+7 -3
View File
@@ -1,6 +1,9 @@
#include "webAPI.h"
namespace webAPI
{
// if status == success, returns "success", or slotName's contents if specified...
// otherwise returns the "message" if no success
std::string simplePost(std::string endpoint, std::string data, std::string slotName)
@@ -21,9 +24,9 @@ std::string simplePost(std::string endpoint, std::string data, std::string slotN
}
else
{
if (j.count("message"))
if (response.count("message"))
{
output = j["message"].get<std::string>();
output = response["message"].get<std::string>();
}
else
{
@@ -59,7 +62,7 @@ nlohmann::json request(std::string endpoint, std::string data, int reqType, ...)
if (res == CURLE_OK && !(readBuffer.empty()))
{
response = json::parse(readBuffer);
response = nlohmann::json::parse(readBuffer);
}
curl_easy_cleanup(curl);
}
@@ -84,3 +87,4 @@ size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
((std::string*)userp)->append((char*)contents, size * nmemb);
return size * nmemb;
}
};