From 999f7894389df465309017eef7a2c3fefe7a2816 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 2 Nov 2014 05:34:49 +0000
Subject: [PATCH] Fix a couple of Makefile errors Helixhorned noticed.
 DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4713 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile        |  5 +----
 polymer/eduke32/Makefile.common | 11 ++++++++++-
 polymer/eduke32/Makefile.msvc   |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 36a01f20d..f544a4f69 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -100,10 +100,7 @@ AUDIOLIB_SRC=$(AUDIOLIB_ROOT)/src
 AUDIOLIB_INC=$(AUDIOLIB_ROOT)/include
 AUDIOLIB_OBJ=$(AUDIOLIB_ROOT)/$(obj)
 
-AUDIOLIB_CFLAGS=-I$(AUDIOLIB_ROOT)/third-party/common/include -DHAVE_VORBIS
-ifneq ($(PLATFORM),WII)
-    AUDIOLIB_CFLAGS+= -DHAVE_FLAC
-endif
+AUDIOLIB_CFLAGS=-I$(AUDIOLIB_ROOT)/third-party/common/include
 
 ifeq ($(PLATFORM),WINDOWS)
     ifeq ($(MIXERTYPE),WIN)
diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index e8067203d..649cc57cd 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -172,6 +172,8 @@ LINKED_GTK = 0
 BUILD32_ON_64 ?= 0
 USE_LIBPNG ?= 1
 USE_LIBVPX ?= 1
+HAVE_VORBIS ?= 1
+HAVE_FLAC ?= 1
 NETCODE ?= 1
 
 LUNATIC ?= 0
@@ -264,7 +266,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10)
     OPTIMIZATIONS += $(DEBUGFLAG)
 endif
 
-CONLYFLAGS=-std=c99 -Wimplicit -Wdeclaration-after-statement
+CONLYFLAGS=-std=gnu99 -Wimplicit -Wdeclaration-after-statement
 CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings
 ASFORMAT=elf$(SYSBITS)
 ASFLAGS=-s -f $(ASFORMAT) #-g
@@ -399,6 +401,7 @@ endif
 ifeq ($(PLATFORM),WII)
     override USE_LIBVPX = 0
     override NETCODE = 0
+    override HAVE_FLAC = 0
 endif
 ifeq ($(PLATFORM),GCW)
     override USE_LIBVPX = 0
@@ -599,6 +602,12 @@ ifneq (0,$(USE_LIBVPX))
     COMPILERFLAGS+= -DUSE_LIBVPX
 endif
 
+ifneq (0,$(HAVE_VORBIS))
+    COMPILERFLAGS+= -DHAVE_VORBIS
+endif
+ifneq (0,$(HAVE_FLAC))
+    COMPILERFLAGS+= -DHAVE_FLAC
+endif
 ifneq (0,$(EFENCE))
     LIBS+= -lefence
     COMPILERFLAGS+= -DEFENCE
diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 4a22d18eb..448bdeb62 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -70,7 +70,7 @@ flags_cl=$(flags_cl) /arch:SSE
 flags_link=/RELEASE /LTCG # /LIBPATH:$(WDKROOT)\lib\wxp\i386 /LIBPATH:$(WDKROOT)\lib\Crt\i386
 !endif
 
-ENGINEOPTS=/DUSE_OPENGL /DPOLYMER /DUSE_LIBPNG /DUSE_LIBVPX
+ENGINEOPTS=/DUSE_OPENGL /DPOLYMER /DUSE_LIBPNG /DUSE_LIBVPX /DHAVE_VORBIS /DHAVE_FLAC
 
 !ifdef CPLUSPLUS
 ENGINEOPTS=$(ENGINEOPTS) /TP
@@ -90,7 +90,7 @@ CFLAGS= /MT /J /nologo $(flags_cl)  \
  	/I$(PLATFORM)\include /I$(AUDIOINC)\include /DRENDERTYPE$(RENDERTYPE)=1 /DMIXERTYPE$(MIXERTYPE)=1 /DSDL_FRAMEWORK /DSDL_TARGET=2 
 
 ENET_CFLAGS=/I$(ENET_INC) /I$(ENET_SRC)
-AUDIOLIB_CFLAGS=/I$(AUDIOLIB_INC) /I$(AUDIOLIB_SRC) /DHAVE_VORBIS /DHAVE_FLAC
+AUDIOLIB_CFLAGS=/I$(AUDIOLIB_INC) /I$(AUDIOLIB_SRC) 
 
 LIBS=user32.lib gdi32.lib shell32.lib winmm.lib ws2_32.lib comctl32.lib shlwapi.lib oleaut32.lib ole32.lib imm32.lib version.lib \
      libFLAC.a libogg.a libvorbis.a libvorbisfile.a libvpx.a libpng_mini.a libz_mini.a libcompat-from-mingw-w64.a \