Skip to content

Commit 08cdad1

Browse files
committed
I do not like '#pragma comment (lib ..'.
Link to 'winmm.lib' explicitly.
1 parent 3fe12df commit 08cdad1

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/Dump1090.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<GenerateDebugInformation>true</GenerateDebugInformation>
9595
<OutputFile>../dump1090.exe</OutputFile>
9696
<SubSystem>Console</SubSystem>
97-
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
97+
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winmm.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
9898
</Link>
9999
</ItemDefinitionGroup>
100100
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -111,7 +111,7 @@
111111
<OutputFile>../dump1090.exe</OutputFile>
112112
<SubSystem>Console</SubSystem>
113113
<OptimizeReferences>false</OptimizeReferences>
114-
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winusb.lib;;ws2_32.lib</AdditionalDependencies>
114+
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winmm.lib;winusb.lib;;ws2_32.lib</AdditionalDependencies>
115115
</Link>
116116
</ItemDefinitionGroup>
117117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -127,7 +127,7 @@
127127
<GenerateDebugInformation>true</GenerateDebugInformation>
128128
<OutputFile>../dump1090.exe</OutputFile>
129129
<SubSystem>Console</SubSystem>
130-
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
130+
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winmm.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
131131
</Link>
132132
</ItemDefinitionGroup>
133133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -143,7 +143,7 @@
143143
<GenerateDebugInformation>true</GenerateDebugInformation>
144144
<OutputFile>../dump1090.exe</OutputFile>
145145
<SubSystem>Console</SubSystem>
146-
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
146+
<AdditionalDependencies>advapi32.lib;dnsapi.lib;iphlpapi.lib;ole32.lib;user32.lib;setupapi.lib;shlwapi.lib;winmm.lib;winusb.lib;ws2_32.lib</AdditionalDependencies>
147147
</Link>
148148
</ItemDefinitionGroup>
149149
<ItemGroup>

src/Makefile.Windows

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ else
189189
$(error Add an env-var 'CPU=x64' (or 'CPU=x86') depending on the active compiler.)
190190
endif
191191

192-
OS_LIBS = advapi32.lib dnsapi.lib iphlpapi.lib ole32.lib setupapi.lib shlwapi.lib uuid.lib user32.lib winusb.lib
192+
OS_LIBS = advapi32.lib dnsapi.lib iphlpapi.lib ole32.lib setupapi.lib shlwapi.lib uuid.lib user32.lib winmm.lib winusb.lib
193193
ASAN_LIBS =
194194
COPY_DLLs =
195195

@@ -743,7 +743,7 @@ define C_preprocess
743743
$(file >> $(1), *---------------------------------------------------------)
744744
$(file >> $(1), * Try to compile this output.)
745745
$(file >> $(1), */)
746-
$(_CC) -E @$(CC).args $(d1PP) $(2) | $(PYTHON) $(OBJ_DIR)/cpp-filter.py $(C_FORMATER) >> $(1)
746+
$(strip $(_CC) -E @$(CC).args $(d1PP) $(2) | $(PYTHON) $(OBJ_DIR)/cpp-filter.py $(C_FORMATER) >> $(1))
747747
endef
748748

749749
#

src/externals/PDC-Mod/amalgamation.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@
4949
#include "winclip.c"
5050
#include "window.c"
5151

52-
#pragma comment (lib, "winmm.lib")

0 commit comments

Comments
 (0)