fixes for Linux build

oyvv · Aug 5, 2020 · c26f6ca · c26f6ca
1 parent 82ea0f3
commit c26f6ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pambase/pambase.cbp b/pambase/pambase.cbp
@@ -142,7 +142,6 @@
 					<Add after="cp ../external/log/lib/* ../lib" />
 					<Add after="cp ../external/dnssd/lib/* ../lib" />
 					<Add after="cp ../external/sapserver/lib/* ../lib" />
-					<Add after="cp ../external/ptpmonkey/bin/lib* ../lib" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
@@ -213,6 +212,7 @@
 			<Add directory="../external/dnssd/lib" />
 			<Add directory="../external/sapserver/lib" />
 			<Add directory="../external/ptpmonkey/bin" />
+			<Add directory="../lib" />
 		</Linker>
 		<Unit filename="AES67ServerMediaSubsession.cpp" />
 		<Unit filename="AES67ServerMediaSubsession.h" />

diff --git a/plugins/MP3Streamer/MP3Streamer.cbp b/plugins/MP3Streamer/MP3Streamer.cbp
@@ -110,6 +110,8 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
+					<Add option="`wx-config --cxxflags`" />
+					<Add option="-fpermissive" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DDLL_EXPORTS" />
 					<Add option="-D__WXGNU__" />
@@ -130,15 +132,13 @@
 					<Add directory="$(#wx.include)/mswu" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option="-Wl,--enable-auto-import,-Map=MP3Streamer.map" />
-					<Add library="wxmsw30u_gcc_custom" />
+					<Add option="`wx-config --libs`" />
 					<Add library="pambase" />
 					<Add library="libmp3lame.a" />
 					<Add library="liblivemedia.a" />
 					<Add library="libBasicUsageEnvironment.a" />
 					<Add library="libUsageEnvironment.a" />
 					<Add library="libgroupsock.a" />
-					<Add library="Ws2_32" />
 					<Add library="pml_log" />
 					<Add directory="$(#wx.lib)" />
 					<Add directory="$(#lame.LIB)" />