Fix Windows build

facchinm · facchinm · commit 52e0a4a28721 · 2019-07-10T11:43:01.000+02:00
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ INSTALLDIR=install
 #
 # Determine OS
 #
-OS:=$(shell uname -s | cut -c -7)
+OS?=$(shell uname -s | cut -c -7)
 
 #
 # Windows rules
@@ -39,7 +39,7 @@ WXVERSION=3.1
 EXE=.exe
 COMMON_SRCS+=WinSerialPort.cpp WinPortFactory.cpp
 COMMON_LDFLAGS=-Wl,--enable-auto-import -static -static-libstdc++ -static-libgcc
-COMMON_LIBS=-ltermcap -Wl,--as-needed -lsetupapi
+COMMON_LIBS=-Wl,--as-needed -lsetupapi
 BOSSA_RC=BossaRes.rc
 WIXDIR="C:\Program Files (x86)\WiX Toolset v3.11\bin"
 CODE_SIGN=$(INSTALLDIR)\\code_sign.p12

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ INSTALLDIR=install`
`28`	`28`	`#`
`29`	`29`	`# Determine OS`
`30`	`30`	`#`
`31`		`-OS:=$(shell uname -s \| cut -c -7)`
	`31`	`+OS?=$(shell uname -s \| cut -c -7)`
`32`	`32`
`33`	`33`	`#`
`34`	`34`	`# Windows rules`
`@@ -39,7 +39,7 @@ WXVERSION=3.1`
`39`	`39`	`EXE=.exe`
`40`	`40`	`COMMON_SRCS+=WinSerialPort.cpp WinPortFactory.cpp`
`41`	`41`	`COMMON_LDFLAGS=-Wl,--enable-auto-import -static -static-libstdc++ -static-libgcc`
`42`		`-COMMON_LIBS=-ltermcap -Wl,--as-needed -lsetupapi`
	`42`	`+COMMON_LIBS=-Wl,--as-needed -lsetupapi`
`43`	`43`	`BOSSA_RC=BossaRes.rc`
`44`	`44`	`WIXDIR="C:\Program Files (x86)\WiX Toolset v3.11\bin"`
`45`	`45`	`CODE_SIGN=$(INSTALLDIR)\\code_sign.p12`