Tweaks for updated MSYS2/MINGW64 rebuild.

iCloudX · May 9, 2022 · 2e518fe · 2e518fe
1 parent 9268282
commit 2e518fe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/adms/files/Makefile.in b/adms/files/Makefile.in
@@ -11,7 +11,7 @@ MAINTAINER = @MAINTAINER@
 
 DEFS = -DHAVE_CONFIG_H  -DinsideElement -DinsidePreprocessor -DinsideVeriloga
 CPPFLAGS = -g -Wall
-CFLAGS = $(DEFS) $(CPPFLAGS) -I.
+CFLAGS = $(DEFS) $(CPPFLAGS) -I. -fcommon
 
 CFILES = adms.c preprocessorLex.c preprocessorMain.c preprocessorYacc.c \
   verilogaYacc.c verilogaLex.c admstpathYacc.c
@@ -20,7 +20,7 @@ COBJS=$(CFILES:.c=.o)
 all: admsXml$(EXEEXT) admsCheck$(EXEEXT)
 
 admsXml$(EXEEXT): adms.implicit.xml.c adms.c admsXml.o $(COBJS)
-	$(CC) -o $@ admsXml.o $(COBJS)
+	$(CC) -o $@ $(CFLAGS) admsXml.o $(COBJS)
 
 admsCheck$(EXEEXT): admsCheck.c adms.c dummy.xml.c dummy.va.c
 	$(CC) -o $@ $(CFLAGS) admsCheck.c adms.o

diff --git a/wrspice/devlib/adms/Makefile.in b/wrspice/devlib/adms/Makefile.in
@@ -165,16 +165,16 @@ DATE = @DATE@
 
 # Advanced users can edit the blocks below if necessary.
 
-ifeq ($(OSNAME),Win32)
+ifeq ($(OSNAME),MINGW)
 
-# Windows, compiler and libraries from win-builds.org.
-CXX = /usr/local/win-builds/bin/g++
-CC = /usr/local/win-builds/bin/gcc
-LINKCC = $(CXX) -static-libgcc -static-libstdc++
-CFLAGS = -O3 -Wall -W -Wshadow -Wwrite-strings -pthread 
+# MINGW x86_64
+CXX = /mingw64/bin/g++
+CC = /mingw64/bin/gcc
+LINKCC = /mingw64/bin/g++ -static-libgcc -static-libstdc++
+CFLAGS = -O2 -Wall -W -Wshadow -Wwrite-strings -pthread 
 LSHFLAG = -shared -Wl,--enable-auto-import,--export-all-symbols
-DEPEND_PROG = $(CC) -MM -O3 -Wall -W -Wshadow -Wwrite-strings -pthread
-FILTER = |sed -e s/C:// -e s///
+DEPEND_PROG = $(CC) -MM -O2 -Wall -W -Wshadow -Wwrite-strings -pthread
+FILTER = 
 PIC_OPT = 
 SOEXT = dll
 DEVWINDLL = -L$(DLL_LOC) -lwrspice

diff --git a/xt_base/configure.in b/xt_base/configure.in
@@ -80,6 +80,7 @@ if test $enable_mingw != yes -a $enable_mingw != no; then
     mingw_dir=$enable_mingw
     mingw=yes
 elif test $enable_mingw = yes; then
+    mingw_dir=/mingw64
     mingw=yes
 fi
 )
@@ -878,7 +879,8 @@ if test $OSNAME = "MINGW"; then
     if test -z $REGEX; then
         MSLIBS="$MSLIBS -lregex -ltre -lintl -liconv"
     fi
-    MSLIBS2="-lbfd -liberty -lintl -liconv -lm"
+    MSLIBS2="$mingw_dir/lib/binutils/libbfd.a \
+ $mingw_dir/lib/binutils/libiberty.a -lintl -liconv -lm"
     dnl -lbfd -liberty required for stackdump.o, and fnmatch used in mswfile.cc
     SLIBS="$MSLIBS"
     LIBS="$MSLIBS $MSLIBS2 $LIBS"