Skip to content

Commit 18d10fc

Browse files
danoli3danoli3
authored
Merge pull request #8458 from danoli3/vs_project
Windows Visual Studio Project Update - Links
2 parents 2f3c636 + 06d6f54 commit 18d10fc

File tree

7 files changed

+42
-101
lines changed

7 files changed

+42
-101
lines changed

‎.github/workflows/of.yml‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
117117

118118
build-vs2022:
119-
runs-on: windows-2022
119+
runs-on: windows-2025
120120
strategy:
121121
matrix:
122122
platform: [x64, ARM64, ARM64EC]
@@ -161,61 +161,6 @@ jobs:
161161
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
162162
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
163163
164-
build-vs2019:
165-
runs-on: windows-2019
166-
strategy:
167-
matrix:
168-
platform: [x64]
169-
env:
170-
BITS: ${{ matrix.bits }}
171-
steps:
172-
- name: Clone repository
173-
uses: actions/checkout@v4
174-
175-
- uses: msys2/[email protected]
176-
with:
177-
update: true
178-
install: >-
179-
git
180-
unzip
181-
182-
- name: Setup MSBuild (VS2019 - 16.11)
183-
uses: microsoft/setup-msbuild@v2
184-
with:
185-
vs-version: "16.11"
186-
msbuild-architecture: x64
187-
188-
- name: Verify MSBuild Version
189-
run: msbuild -version
190-
191-
- name: Download libs
192-
run: ./scripts/vs/download_libs_2019_x64.sh -t $RELEASE
193-
194-
- name: Download projectGenerator
195-
shell: bash
196-
run: ./scripts/vs/download_projectGenerator.sh
197-
198-
- name: Debug projectGenerator Directory
199-
shell: bash
200-
run: |
201-
echo "Checking projectGenerator directory:"
202-
ls -la projectGenerator/
203-
204-
# - name: run projectGenerator on examples
205-
# shell: bash
206-
# run: ./scripts/ci/vs/pg_projects.sh
207-
208-
# - name: Build DEBUG and RELEASE emptyExample
209-
# working-directory: ${{env.GITHUB_WORKSPACE}}
210-
# run: |
211-
# msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
212-
# msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
213-
# - name: Build DEBUG and RELEASE allAddonsExample
214-
# working-directory: ${{env.GITHUB_WORKSPACE}}
215-
# run: |
216-
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
217-
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
218-
219164
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
220165

221166
rpi-build:

‎libs/openFrameworks/utils/ofURLFileLoader.cpp‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ using std::string;
1616

1717
#define MAX_POSTFIELDS_SIZE (1024 * 1024)
1818

19-
#define NO_OPENSSL 1
2019
#include <openssl/evp.h>
2120
#include <openssl/pem.h>
2221
#include <openssl/x509.h>
@@ -25,10 +24,9 @@ using std::string;
2524
#include <iostream>
2625
#include <fstream>
2726

28-
#if !defined(NO_OPENSSL)
29-
#define CERTIFICATE_FILE "ssl/cacert.pem"
30-
#define PRIVATE_KEY_FILE "ssl/cacert.key"
31-
#endif
27+
#define CERTIFICATE_FILE "cacert.pem"
28+
#define PRIVATE_KEY_FILE "cacert.key"
29+
3230
#endif
3331

3432
int ofHttpRequest::nextID = 0;
@@ -51,10 +49,8 @@ class ofURLFileLoaderImpl : public ofThread, public ofBaseURLFileLoader {
5149
void remove(int id);
5250
void clear();
5351
void stop();
54-
#if !defined(NO_OPENSSL)
5552
bool checkValidCertifcate(const std::string& cert_file);
5653
void createSSLCertificate();
57-
#endif
5854
ofHttpResponse handleRequest(const ofHttpRequest & request);
5955
int handleRequestAsync(const ofHttpRequest & request); // returns id
6056

@@ -134,8 +130,9 @@ void ofURLFileLoaderImpl::stop() {
134130
curl_global_cleanup();
135131
}
136132

137-
#if !defined(NO_OPENSSL)
133+
138134
bool ofURLFileLoaderImpl::checkValidCertifcate(const std::string & cert_file) {
135+
#if !defined(NO_OPENSSL)
139136
try {
140137
FILE * fp = fopen(cert_file.c_str(), "r");
141138
if (!fp) return false;
@@ -154,10 +151,12 @@ bool ofURLFileLoaderImpl::checkValidCertifcate(const std::string & cert_file) {
154151
ofLogError("ofURLFileLoader") << "Unknown error occurred in checkValidCertifcate.";
155152
return false;
156153
}
154+
#endif
157155
}
158156

159157

160158
void ofURLFileLoaderImpl::createSSLCertificate() {
159+
#if !defined(NO_OPENSSL)
161160
try {
162161
EVP_PKEY * pkey = nullptr;
163162
X509 * x509 = nullptr;
@@ -233,8 +232,9 @@ void ofURLFileLoaderImpl::createSSLCertificate() {
233232
} catch (...) {
234233
ofLogError("ofURLFileLoader") << "Unknown error occurred in createSSLCertificate.";
235234
}
236-
}
237235
#endif
236+
}
237+
238238

239239

240240
void ofURLFileLoaderImpl::threadedFunction() {
@@ -317,18 +317,6 @@ ofHttpResponse ofURLFileLoaderImpl::handleRequest(const ofHttpRequest & request)
317317
}
318318
}
319319
if(version->features & CURL_VERSION_SSL) {
320-
#if !defined(NO_OPENSSL)
321-
const std::string caPath = "ssl";
322-
const std::string caFile = "ssl/cacert.pem";
323-
if (ofFile::doesFileExist(ofToDataPath(CERTIFICATE_FILE)) && checkValidCertifcate(ofToDataPath(CERTIFICATE_FILE))) {
324-
ofLogVerbose("ofURLFileLoader") << "SSL valid certificate found";
325-
} else {
326-
ofLogVerbose("ofURLFileLoader") << "SSL certificate not found - generating";
327-
createSSLCertificate();
328-
}
329-
curl_easy_setopt(curl.get(), CURLOPT_CAPATH, ofToDataPath(caPath, true).c_str());
330-
curl_easy_setopt(curl.get(), CURLOPT_CAINFO, ofToDataPath(caFile, true).c_str());
331-
#endif
332320
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, false);
333321
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2L);
334322
}

‎libs/openFrameworksCompiled/project/CMake/toolchain/android.toolchain.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ set(ANDROID_NATIVE_API_LEVEL ${ANDROID_API})
4444
# Detect Host Platform
4545
if(NOT DEFINED HOST_PLATFORM)
4646
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
47-
#if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
48-
# set(HOST_PLATFORM "darwin-arm64")
49-
#else()
47+
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
48+
set(HOST_PLATFORM "darwin-arm64")
49+
else()
5050
set(HOST_PLATFORM "darwin-x86_64")
51-
#endif()
51+
endif()
5252
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
5353
set(HOST_PLATFORM "windows-x86_64") # Windows ARM64 is rare, adjust if needed
5454
elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
@@ -79,29 +79,29 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a")
7979
set(CMAKE_ANDROID_ARM_MODE ON)
8080
set(CMAKE_ANDROID_ARM_NEON ON)
8181
set(CMAKE_SYSTEM_PROCESSOR "armv7-a")
82-
set(CMAKE_C_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
83-
set(CMAKE_CXX_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
82+
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}")
83+
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}")
8484
elseif(ANDROID_ABI STREQUAL "arm64-v8a")
8585
set(MACHINE "arm64")
8686
set(ANDROID_PREFIX "aarch64-linux-android")
8787
set(ANDROID_TARGET "aarch64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
8888
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
89-
set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
90-
set(CMAKE_CXX_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
89+
set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
90+
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
9191
elseif(ANDROID_ABI STREQUAL "x86")
9292
set(MACHINE "i686")
9393
set(ANDROID_PREFIX "i686-linux-android")
9494
set(ANDROID_TARGET "i686-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
9595
set(CMAKE_SYSTEM_PROCESSOR "i686")
96-
set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
97-
set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
96+
set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
97+
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
9898
elseif(ANDROID_ABI STREQUAL "x86_64")
9999
set(MACHINE "x86_64")
100100
set(ANDROID_PREFIX "x86_64-linux-android")
101101
set(ANDROID_TARGET "x86_64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
102102
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
103-
set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
104-
set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
103+
set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
104+
set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
105105
else()
106106
message(FATAL_ERROR "Unsupported ANDROID_ABI: ${ANDROID_ABI}")
107107
endif()

‎libs/openFrameworksCompiled/project/android/openframeworksAndroid/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set(PRJ_OFX_ANDROID_CPP_PATH ${PRJ_ADDONS_PATH}/ofxAndroid/src)
2626
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2727
set(CMAKE_CXX_EXTENSIONS OFF)
2828
set(CONFIGURATION_BUILD_DIR ${OF_ANDROID_OUTPUT})
29-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ferror-limit=0 -std=c17 -Oz -Wall -fno-short-enums -fPIE -fPIC -fexceptions -ffunction-sections -fdata-sections")
30-
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")
29+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall -fno-short-enums -fPIE -fPIC")
30+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall -fno-short-enums -fPIE -fPIC -fexceptions")
3131
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-export-dynamic")
3232
file(GLOB OF_SOURCES
3333
${OF_SOURCE_DIR}/*.cpp

‎libs/openFrameworksCompiled/project/android/openframeworksAndroid/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ tasks.register("prepareKotlinBuildScriptModel"){}
1818
android {
1919
namespace 'cc.openframeworks.android'
2020
compileSdkVersion 34
21-
ndkVersion '28.0.13004108'
22-
buildToolsVersion '35.0.0' // Updated from 35.0.1 to 34.0.0
21+
ndkVersion '28.2.13676358'
22+
buildToolsVersion '35.0.0'
2323

2424
defaultConfig {
2525
minSdkVersion 34
@@ -43,6 +43,8 @@ android {
4343
// Enable NEON only for ARM architectures
4444
if (android.defaultConfig.ndk.abiFilters.contains("armeabi-v7a") || android.defaultConfig.ndk.abiFilters.contains("arm64-v8a")) {
4545
arguments "-DANDROID_ARM_NEON=TRUE"
46+
} else {
47+
arguments "-DANDROID_ARM_NEON=FALSE"
4648
}
4749

4850
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'

‎libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,16 @@
7777
<Optimization>Disabled</Optimization>
7878
<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>
7979
<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>
80+
<Link>
81+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
82+
</Link>
8083
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8184
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8285
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8386
<WarningLevel>Level3</WarningLevel>
8487
<BrowseInformation>false</BrowseInformation>
8588
<CompileAs>CompileAsCpp</CompileAs>
86-
<LanguageStandard>stdcpplatest</LanguageStandard>
89+
<LanguageStandard>stdcpp23</LanguageStandard>
8790
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
8891
<BufferSecurityCheck Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</BufferSecurityCheck>
8992
<LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdc17</LanguageStandard_C>
@@ -121,6 +124,9 @@
121124
<WholeProgramOptimization>false</WholeProgramOptimization>
122125
<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>
123126
<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>
127+
<Link>
128+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
129+
</Link>
124130
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
125131
<WarningLevel>Level1</WarningLevel>
126132
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎scripts/templates/vs/emptyExample.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<CompileAs>CompileAsCpp</CompileAs>
8787
<MultiProcessorCompilation>true</MultiProcessorCompilation>
8888
<ObjectFileName>$(IntDir)\Build\%(RelativeDir)\$(Configuration)\</ObjectFileName>
89-
<LanguageStandard>stdcpplatest</LanguageStandard>
89+
<LanguageStandard>stdcpp23</LanguageStandard>
9090
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
9191
</ClCompile>
9292
<PostBuildEvent>
@@ -97,7 +97,7 @@
9797
<GenerateDebugInformation>true</GenerateDebugInformation>
9898
<SubSystem>Console</SubSystem>
9999
<RandomizedBaseAddress>true</RandomizedBaseAddress>
100-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
100+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
101101
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
102102
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
103103
</Link>
@@ -107,7 +107,7 @@
107107
<GenerateDebugInformation>true</GenerateDebugInformation>
108108
<SubSystem>Console</SubSystem>
109109
<RandomizedBaseAddress>true</RandomizedBaseAddress>
110-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
110+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
111111
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
112112
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
113113
</Link>
@@ -117,7 +117,7 @@
117117
<GenerateDebugInformation>true</GenerateDebugInformation>
118118
<SubSystem>Console</SubSystem>
119119
<RandomizedBaseAddress>true</RandomizedBaseAddress>
120-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
120+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
121121
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
122122
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
123123
</Link>
@@ -145,7 +145,7 @@
145145
<OptimizeReferences>true</OptimizeReferences>
146146
<EnableCOMDATFolding>true</EnableCOMDATFolding>
147147
<RandomizedBaseAddress>true</RandomizedBaseAddress>
148-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
148+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
149149
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
150150
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
151151
</Link>
@@ -158,7 +158,7 @@
158158
<OptimizeReferences>true</OptimizeReferences>
159159
<EnableCOMDATFolding>true</EnableCOMDATFolding>
160160
<RandomizedBaseAddress>true</RandomizedBaseAddress>
161-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
161+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
162162
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
163163
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
164164
</Link>
@@ -171,7 +171,7 @@
171171
<OptimizeReferences>true</OptimizeReferences>
172172
<EnableCOMDATFolding>true</EnableCOMDATFolding>
173173
<RandomizedBaseAddress>true</RandomizedBaseAddress>
174-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
174+
<AdditionalDependencies>iphlpapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;advapi32.lib;winmm.lib;normaliz.lib;%(AdditionalDependencies)</AdditionalDependencies>
175175
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
176176
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
177177
</Link>

0 commit comments

Comments
 (0)