Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 1 addition & 56 deletions .github/workflows/of.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

build-vs2022:
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
platform: [x64, ARM64, ARM64EC]
Expand Down Expand Up @@ -161,61 +161,6 @@ jobs:
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143

build-vs2019:
runs-on: windows-2019
strategy:
matrix:
platform: [x64]
env:
BITS: ${{ matrix.bits }}
steps:
- name: Clone repository
uses: actions/checkout@v4

- uses: msys2/[email protected]
with:
update: true
install: >-
git
unzip

- name: Setup MSBuild (VS2019 - 16.11)
uses: microsoft/setup-msbuild@v2
with:
vs-version: "16.11"
msbuild-architecture: x64

- name: Verify MSBuild Version
run: msbuild -version

- name: Download libs
run: ./scripts/vs/download_libs_2019_x64.sh -t $RELEASE

- name: Download projectGenerator
shell: bash
run: ./scripts/vs/download_projectGenerator.sh

- name: Debug projectGenerator Directory
shell: bash
run: |
echo "Checking projectGenerator directory:"
ls -la projectGenerator/

# - name: run projectGenerator on examples
# shell: bash
# run: ./scripts/ci/vs/pg_projects.sh

# - name: Build DEBUG and RELEASE emptyExample
# working-directory: ${{env.GITHUB_WORKSPACE}}
# run: |
# msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
# msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
# - name: Build DEBUG and RELEASE allAddonsExample
# working-directory: ${{env.GITHUB_WORKSPACE}}
# run: |
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142

# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

rpi-build:
Expand Down
30 changes: 9 additions & 21 deletions libs/openFrameworks/utils/ofURLFileLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ using std::string;

#define MAX_POSTFIELDS_SIZE (1024 * 1024)

#define NO_OPENSSL 1
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
Expand All @@ -25,10 +24,9 @@ using std::string;
#include <iostream>
#include <fstream>

#if !defined(NO_OPENSSL)
#define CERTIFICATE_FILE "ssl/cacert.pem"
#define PRIVATE_KEY_FILE "ssl/cacert.key"
#endif
#define CERTIFICATE_FILE "cacert.pem"
#define PRIVATE_KEY_FILE "cacert.key"

#endif

int ofHttpRequest::nextID = 0;
Expand All @@ -51,10 +49,8 @@ class ofURLFileLoaderImpl : public ofThread, public ofBaseURLFileLoader {
void remove(int id);
void clear();
void stop();
#if !defined(NO_OPENSSL)
bool checkValidCertifcate(const std::string& cert_file);
void createSSLCertificate();
#endif
ofHttpResponse handleRequest(const ofHttpRequest & request);
int handleRequestAsync(const ofHttpRequest & request); // returns id

Expand Down Expand Up @@ -134,8 +130,9 @@ void ofURLFileLoaderImpl::stop() {
curl_global_cleanup();
}

#if !defined(NO_OPENSSL)

bool ofURLFileLoaderImpl::checkValidCertifcate(const std::string & cert_file) {
#if !defined(NO_OPENSSL)
try {
FILE * fp = fopen(cert_file.c_str(), "r");
if (!fp) return false;
Expand All @@ -154,10 +151,12 @@ bool ofURLFileLoaderImpl::checkValidCertifcate(const std::string & cert_file) {
ofLogError("ofURLFileLoader") << "Unknown error occurred in checkValidCertifcate.";
return false;
}
#endif
}


void ofURLFileLoaderImpl::createSSLCertificate() {
#if !defined(NO_OPENSSL)
try {
EVP_PKEY * pkey = nullptr;
X509 * x509 = nullptr;
Expand Down Expand Up @@ -233,8 +232,9 @@ void ofURLFileLoaderImpl::createSSLCertificate() {
} catch (...) {
ofLogError("ofURLFileLoader") << "Unknown error occurred in createSSLCertificate.";
}
}
#endif
}



void ofURLFileLoaderImpl::threadedFunction() {
Expand Down Expand Up @@ -317,18 +317,6 @@ ofHttpResponse ofURLFileLoaderImpl::handleRequest(const ofHttpRequest & request)
}
}
if(version->features & CURL_VERSION_SSL) {
#if !defined(NO_OPENSSL)
const std::string caPath = "ssl";
const std::string caFile = "ssl/cacert.pem";
if (ofFile::doesFileExist(ofToDataPath(CERTIFICATE_FILE)) && checkValidCertifcate(ofToDataPath(CERTIFICATE_FILE))) {
ofLogVerbose("ofURLFileLoader") << "SSL valid certificate found";
} else {
ofLogVerbose("ofURLFileLoader") << "SSL certificate not found - generating";
createSSLCertificate();
}
curl_easy_setopt(curl.get(), CURLOPT_CAPATH, ofToDataPath(caPath, true).c_str());
curl_easy_setopt(curl.get(), CURLOPT_CAINFO, ofToDataPath(caFile, true).c_str());
#endif
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, false);
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2L);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ set(ANDROID_NATIVE_API_LEVEL ${ANDROID_API})
# Detect Host Platform
if(NOT DEFINED HOST_PLATFORM)
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
#if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
# set(HOST_PLATFORM "darwin-arm64")
#else()
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
set(HOST_PLATFORM "darwin-arm64")
else()
set(HOST_PLATFORM "darwin-x86_64")
#endif()
endif()
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
set(HOST_PLATFORM "windows-x86_64") # Windows ARM64 is rare, adjust if needed
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
Expand Down Expand Up @@ -79,29 +79,29 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a")
set(CMAKE_ANDROID_ARM_MODE ON)
set(CMAKE_ANDROID_ARM_NEON ON)
set(CMAKE_SYSTEM_PROCESSOR "armv7-a")
set(CMAKE_C_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
set(CMAKE_CXX_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
set(CMAKE_C_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
set(CMAKE_CXX_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
elseif(ANDROID_ABI STREQUAL "arm64-v8a")
set(MACHINE "arm64")
set(ANDROID_PREFIX "aarch64-linux-android")
set(ANDROID_TARGET "aarch64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
set(CMAKE_CXX_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
elseif(ANDROID_ABI STREQUAL "x86")
set(MACHINE "i686")
set(ANDROID_PREFIX "i686-linux-android")
set(ANDROID_TARGET "i686-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
set(CMAKE_SYSTEM_PROCESSOR "i686")
set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
elseif(ANDROID_ABI STREQUAL "x86_64")
set(MACHINE "x86_64")
set(ANDROID_PREFIX "x86_64-linux-android")
set(ANDROID_TARGET "x86_64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
else()
message(FATAL_ERROR "Unsupported ANDROID_ABI: ${ANDROID_ABI}")
endif()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ set(PRJ_OFX_ANDROID_CPP_PATH ${PRJ_ADDONS_PATH}/ofxAndroid/src)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CONFIGURATION_BUILD_DIR ${OF_ANDROID_OUTPUT})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ferror-limit=0 -std=c17 -Oz -Wall -fno-short-enums -fPIE -fPIC -fexceptions -ffunction-sections -fdata-sections")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=0 -std=c++23 -Oz -stdlib=libc++ -Wall -fno-short-enums -fPIE -fPIC -fexceptions -ffunction-sections -fdata-sections")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall -fno-short-enums -fPIE -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall -fno-short-enums -fPIE -fPIC -fexceptions")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
file(GLOB OF_SOURCES
${OF_SOURCE_DIR}/*.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ tasks.register("prepareKotlinBuildScriptModel"){}
android {
namespace 'cc.openframeworks.android'
compileSdkVersion 34
ndkVersion '28.0.13004108'
buildToolsVersion '35.0.0' // Updated from 35.0.1 to 34.0.0
ndkVersion '28.2.13676358'
buildToolsVersion '35.0.0'

defaultConfig {
minSdkVersion 34
Expand All @@ -43,6 +43,8 @@ android {
// Enable NEON only for ARM architectures
if (android.defaultConfig.ndk.abiFilters.contains("armeabi-v7a") || android.defaultConfig.ndk.abiFilters.contains("arm64-v8a")) {
arguments "-DANDROID_ARM_NEON=TRUE"
} else {
arguments "-DANDROID_ARM_NEON=FALSE"
}

abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,16 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\FreeImage\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;_HAS_STREAM_INSERTION_OPERATORS_DELETED_IN_CXX20;_DEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;OF_NO_FMOD;GLM_FORCE_CTOR_INIT;GLM_ENABLE_EXPERIMENTAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<BrowseInformation>false</BrowseInformation>
<CompileAs>CompileAsCpp</CompileAs>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard>stdcpp23</LanguageStandard>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</BufferSecurityCheck>
<LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdc17</LanguageStandard_C>
Expand Down Expand Up @@ -121,6 +124,9 @@
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(OF_ROOT)\libs\openFrameworks;$(OF_ROOT)\libs\openFrameworks\graphics;$(OF_ROOT)\libs\openFrameworks\app;$(OF_ROOT)\libs\openFrameworks\sound;$(OF_ROOT)\libs\openFrameworks\utils;$(OF_ROOT)\libs\openFrameworks\communication;$(OF_ROOT)\libs\openFrameworks\video;$(OF_ROOT)\libs\openFrameworks\types;$(OF_ROOT)\libs\openFrameworks\math;$(OF_ROOT)\libs\openFrameworks\3d;$(OF_ROOT)\libs\openFrameworks\gl;$(OF_ROOT)\libs\openFrameworks\events;$(OF_ROOT)\libs\glut\include;$(OF_ROOT)\libs\glm\include;$(OF_ROOT)\libs\rtAudio\include;$(OF_ROOT)\libs\quicktime\include;$(OF_ROOT)\libs\freetype\include;$(OF_ROOT)\libs\freetype\include\freetype2;$(OF_ROOT)\libs\FreeImage\include;$(OF_ROOT)\libs\videoInput\include;$(OF_ROOT)\libs\glew\include\;$(OF_ROOT)\libs\glu\include;$(OF_ROOT)\libs\tess2\include;$(OF_ROOT)\libs\cairo\include;$(OF_ROOT)\libs\poco\include;$(OF_ROOT)\libs\glfw\include;$(OF_ROOT)\libs\openssl\include;$(OF_ROOT)\libs\utf8\include;$(OF_ROOT)\libs\json\include;$(OF_ROOT)\libs\curl\include;$(OF_ROOT)\libs\uriparser\include;$(OF_ROOT)\libs\pugixml\include;$(OF_ROOT)\addons;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;CURL_STATICLIB;FREEIMAGE_LIB;URI_STATIC_BUILD;_HAS_STREAM_INSERTION_OPERATORS_DELETED_IN_CXX20;NDEBUG;_CONSOLE;POCO_STATIC;CAIRO_WIN32_STATIC_BUILD;DISABLE_SOME_FLOATING_POINT;OF_NO_FMOD;GLM_FORCE_CTOR_INIT;GLM_ENABLE_EXPERIMENTAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level1</WarningLevel>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand Down
14 changes: 7 additions & 7 deletions scripts/templates/vs/emptyExample.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<CompileAs>CompileAsCpp</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)\Build\%(RelativeDir)\$(Configuration)\</ObjectFileName>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard>stdcpp23</LanguageStandard>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<PostBuildEvent>
Expand All @@ -97,7 +97,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand All @@ -107,7 +107,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand All @@ -117,7 +117,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand Down Expand Up @@ -145,7 +145,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand All @@ -158,7 +158,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand All @@ -171,7 +171,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
</Link>
Expand Down
Loading