From 2fec586906b41748be92677a0a0125bcebe8b835 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 19 Dec 2010 18:15:36 +0000
Subject: [PATCH] Revert the four Makefiles to have a base version in case I
 screw up again...

git-svn-id: https://svn.eduke32.com/eduke32@1738 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile                  | 4 ++--
 polymer/eduke32/build/Makefile            | 2 +-
 polymer/eduke32/source/enet/Makefile      | 2 +-
 polymer/eduke32/source/jaudiolib/Makefile | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index c381ca0eb..51f40171d 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -16,7 +16,7 @@ SUPERBUILD = 1
 POLYMOST = 1
 POLYMER = 1
 USE_OPENGL = 1
-NOASM ?= 0
+NOASM = 0
 LINKED_GTK = 0
 BUILD32_ON_64 = 0
 NEDMALLOC = 1
@@ -71,7 +71,7 @@ JAUDIOLIB=libjfaudiolib.a
 ENETDIR=$(SRC)/enet
 ENETLIB=libenet.a
 
-CC?=gcc
+CC=gcc
 CXX=g++
 AS=nasm
 RC=windres
diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile
index bbdab2991..ba9845b5d 100644
--- a/polymer/eduke32/build/Makefile
+++ b/polymer/eduke32/build/Makefile
@@ -94,7 +94,7 @@ ifneq (0,$(DEBUGANYWAY))
     debug+=-ggdb
 endif
 
-CC?=gcc
+CC=gcc
 CXX=gcc
 AS=nasm
 RC=windres
diff --git a/polymer/eduke32/source/enet/Makefile b/polymer/eduke32/source/enet/Makefile
index f7b1691f5..94549157d 100644
--- a/polymer/eduke32/source/enet/Makefile
+++ b/polymer/eduke32/source/enet/Makefile
@@ -1,4 +1,4 @@
-CC?=gcc
+CC=gcc
 OBJ=obj
 OBJNAME?=libenet.a
 PRETTY_OUTPUT?=1
diff --git a/polymer/eduke32/source/jaudiolib/Makefile b/polymer/eduke32/source/jaudiolib/Makefile
index 66c443b6c..085cc6d7b 100644
--- a/polymer/eduke32/source/jaudiolib/Makefile
+++ b/polymer/eduke32/source/jaudiolib/Makefile
@@ -1,4 +1,4 @@
-CC?=gcc
+CC=gcc
 OBJ=obj
 OBJNAME?=libjfaudiolib.a
 PRETTY_OUTPUT?=1