p6

nixxoq · May 13, 2024 · 2dd9daa · 2dd9daa
1 parent 1346a01
commit 2dd9daa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml
@@ -32,7 +32,7 @@ jobs:
           path: |
             build\Debug\xp-apps.exe
             build\Debug\cpr.dll
-            build\Debug\libcurl.dll
+            build\Debug\libcurl-d.dll
             build\Debug\zlib.dll
       
   build_debug_x64:
@@ -54,13 +54,18 @@ jobs:
           path: | 
             build\Debug\xp-apps.exe
             build\Debug\cpr.dll
-            build\Debug\libcurl.dll
+            build\Debug\libcurl-d.dll
             build\Debug\zlib.dll
 
   build_release_x86:
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
+
+      - uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: '14.0'
+          msbuild-architecture: x86
 
       # - run: dir "C:\Program Files"
 

diff --git a/main.cpp b/main.cpp
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
     // }
 
     curl_global_init(CURL_GLOBAL_DEFAULT);
-    // getFile("https://raw.githubusercontent.com/Snaky1a/xp-apps/development/upd.json");
+    getFile("https://raw.githubusercontent.com/Snaky1a/xp-apps/development/upd.json");
 
     if (!checkFlags(argc, argv))
     {

diff --git a/source/functions.cpp b/source/functions.cpp
@@ -20,28 +20,28 @@ static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp)
     return size * nmemb;
 }
 
-// void getFile(std::string url)
-// {
-//     CURL *curl = curl_easy_init();
-//     if (curl)
-//     {
-//         CURLcode res;
-//         curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-//         curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-
-//         std::string response;
-
-//         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-//         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-//         res = curl_easy_perform(curl);
-//         if (res != 0)
-//         {
-//             fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-//         }
-//         curl_easy_cleanup(curl);
-//         std::cout << response << std::endl;
-//     }
-// }
+void getFile(std::string url)
+{
+    CURL *curl = curl_easy_init();
+    if (curl)
+    {
+        CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+
+        std::string response;
+
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+        res = curl_easy_perform(curl);
+        if (res != 0)
+        {
+            fprintf(stderr, "curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
+        }
+        curl_easy_cleanup(curl);
+        std::cout << response << std::endl;
+    }
+}
 
 int checkFlags(int argc, char **argv)
 {