Merge remote-tracking branch 'origin/fix/linux-compilation' into main

Author: jvmvik

.gitignore

@@ -30,3 +30,9 @@
 *.exe
 *.out
 *.app
+
+# Build
+build
+
+# Editor
+.vscode

Makefile

@@ -7,22 +7,25 @@ all: build run
 
 # initialize meson build
 init:
-	-rm -rf build/
+	rm -rf build/
 	meson setup build
 
 # build application
 build:
 	meson compile -C build -v
+	cd build && ninja
 
 # run application
 run:
 	./build/serpapi-search-cpp
 
 # tested on AARCH64 and x86
 install_linux:
-	sudo apt-get install -f libcurl4-openssl-dev libjsoncpp-dev
-	brew curl jsoncpp
+	sudo apt update -y && sudo apt install -f -y build-essential meson pkg-config curl cmake meson ninja-build libcurl4-openssl-dev rapidjson-dev
 
 # tested on Apple M1 aarch64
 install_apple:
 	brew install meson pkg-config curl cmake meson ninja rapidjson
+
+# reset build directory
+reset: init

Rakefile

@@ -7,7 +7,7 @@ task :default do
         'googlesearch.hpp',
     ]
     source = 'google'
-    names = %w(bing baidu homedepot yahoo yandex wallmart youtube linkedin)
+    names = %w(bing baidu homedepot yahoo yandex walmart youtube linkedin)
     names.each do |name|
         files.each do |fn|
             buf = File.read(fn)
@@ -27,4 +27,4 @@ task :default do
     names.each do |name|
         puts "serpapi::#{name.capitalize}Search search(parameter, apiKey);"
     end
-end
+end

main.cpp

@@ -43,7 +43,7 @@ int main()
     std::map<string, string> parameter;
     parameter["q"] = "coffee";
     parameter["location"] = "Austin,TX";
-    char* env_p = std::getenv("API_KEY");
+    const char* env_p = std::getenv("API_KEY");
     std::string apiKey(env_p);
     std::string engine = "google";
 

meson.build

@@ -1,10 +1,10 @@
 project('serpapi-search-cpp', 'cpp',
   version : '0.1',
-  default_options : ['warning_level=3', 'cpp_std=c++14'])
+  default_options : ['warning_level=3', 'cpp_std=c++17'])
 
 dep = [
-    dependency('curl'),
-    dependency('rapidjson')
+    dependency('libcurl'),
+    dependency('RapidJSON')
     ]
 
 executable('serpapi-search-cpp',

serpapisearch.cpp

@@ -72,7 +72,7 @@ string SerpApiSearch::GetHtml()
    return getRawResult("/search", GetParameter(false));
 }
 
-string SerpApiSearch::getRawResult(string uri, string parameter) 
+string SerpApiSearch::getRawResult(string uri, string parameter)
 {
    curl_global_init(CURL_GLOBAL_DEFAULT);
    curl = curl_easy_init();
@@ -121,4 +121,4 @@ Document SerpApiSearch::GetSearchArchive(string searchID)
 {
    return SerpApiSearch::getJsonResult("/searches/" + searchID + ".json", SerpApiSearch::GetParameter(true));
 };
-};
+};

serpapisearch.hpp

@@ -51,4 +51,4 @@ class SerpApiSearch {
 };
 }
 
-#endif
+#endif