Am 11.12.2016 um 11:35 schrieb Erik de Castro Lopo:
New pre-release here is at:

     http://mega-nerd.com/tmp/flac-1.3.2pre2-win.zip
     http://mega-nerd.com/tmp/flac-1.3.2pre2.tar.xz

Changes:

* Fix PACKAGE_VERSION in MSVS project files.
* Fix Makefile.lite in tarball (make test is still failiing).

Thank you for providing a second preview!

Unfortunately, the Makefile.lite files in win_utf8_io and flactimer are still missing. The attached patch adds them and also changes config.mk to not use -fPIC on Windows (to avoid compiler warnings, because all code is position independent on Windows).

make test fails because common.sh is missing (it's generated from common.sh.in during configure). The only variable being replaced in that step is @EXEEXT@, so one possible solution would be to detect a Windows OS using something like '|if["$(expr substr $(uname -s) 1 10)"=="MINGW32_NT"];|' and set EXE=.exe in that case instead of generating the file from common.sh.in.

----
Robert Kausch
robert.kau...@freac.org

diff -Naur flac-1.3.2pre2/build/config.mk flac-1.3.2pre2+litefix/build/config.mk
--- flac-1.3.2pre2/build/config.mk	2016-12-11 10:24:00 +0000
+++ flac-1.3.2pre2+litefix/build/config.mk	2016-12-11 11:37:13 +0000
@@ -42,15 +42,9 @@
 ifndef PROC
     ifeq ($(findstring Windows,$(OS)),Windows)
         PROC := i386 # failsafe
-        USE_ICONV := 0
-        USE_LANGINFO_CODESET := 0
-        ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
-            USE_FSEEKO := 0
-        endif
         # ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
         ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
             PROC := x86_64
-            F_PIC :=
         endif
     else
         ifeq ($(shell uname -p),amd64)
@@ -75,6 +69,15 @@
     USE_ICONV := 0
 endif
 
+ifeq ($(findstring Windows,$(OS)),Windows)
+    F_PIC :=
+    USE_ICONV := 0
+    USE_LANGINFO_CODESET := 0
+    ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
+        USE_FSEEKO := 0
+    endif
+endif
+
 debug    : BUILD = debug
 valgrind : BUILD = debug
 release  : BUILD = release
diff -Naur flac-1.3.2pre2/src/share/Makefile.am flac-1.3.2pre2+litefix/src/share/Makefile.am
--- flac-1.3.2pre2/src/share/Makefile.am	2016-12-07 20:10:26 +0000
+++ flac-1.3.2pre2+litefix/src/share/Makefile.am	2016-12-11 11:12:53 +0000
@@ -46,6 +46,7 @@
 	utf8/utf8_static.vcproj \
 	utf8/utf8_static.vcxproj \
 	utf8/utf8_static.vcxproj.filters \
+	win_utf8_io/Makefile.lite \
 	win_utf8_io/win_utf8_io_static.vcproj \
 	win_utf8_io/win_utf8_io_static.vcxproj \
 	win_utf8_io/win_utf8_io_static.vcxproj.filters
diff -Naur flac-1.3.2pre2/src/utils/flactimer/Makefile.am flac-1.3.2pre2+litefix/src/utils/flactimer/Makefile.am
--- flac-1.3.2pre2/src/utils/flactimer/Makefile.am	2016-12-07 20:10:26 +0000
+++ flac-1.3.2pre2+litefix/src/utils/flactimer/Makefile.am	2016-12-11 11:15:08 +0000
@@ -17,6 +17,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 EXTRA_DIST = \
+	Makefile.lite \
 	flactimer.vcproj \
 	flactimer.vcxproj \
 	flactimer.vcxproj.filters \
_______________________________________________
flac-dev mailing list
flac-dev@xiph.org
http://lists.xiph.org/mailman/listinfo/flac-dev

Reply via email to