diff -ru virtualjaguar-1.0.7-src.orig/Makefile virtualjaguar-1.0.7-src/Makefile
--- virtualjaguar-1.0.7-src.orig/Makefile	2004-04-18 18:09:14.000000000 -0400
+++ virtualjaguar-1.0.7-src/Makefile	2010-10-13 13:09:31.889211820 -0400
@@ -6,23 +6,18 @@
 # easier for the maintainers. :-)
 #
 
-CC         = gcc
-LD         = gcc
 TARGET     = vj$(EXESUFFIX)
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
-		-ffast-math -fomit-frame-pointer `sdl-config --cflags`
-#		-fomit-frame-pointer `sdl-config --cflags` -g
-#		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
-
-LDFLAGS =
+CFLAGS += -Wall -Wno-switch -D$(SYSTYPE) `sdl-config --cflags`
+CXXFLAGS += -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) `sdl-config --cflags`
 
 LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 
 INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
 
 THECC = $(CC) $(CFLAGS) $(INCS)
+THECXX = $(CXX) $(CXXFLAGS) $(INCS)
 
 OBJS = \
 	obj/anajoy.o \
@@ -70,16 +65,16 @@
 	$(THECC) -c $< -o $@
 
 obj/%.o: src/%.cpp src/include/%.h
-	$(THECC) -c $< -o $@
+	$(THECXX) -c $< -o $@
 
 obj/%.o: src/%.c
 	$(THECC) -c $< -o $@
 
 obj/%.o: src/%.cpp
-	$(THECC) -c $< -o $@
+	$(THECXX) -c $< -o $@
 
 $(TARGET): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #	strip --strip-all vj$(EXESUFFIX)
 #	upx -9 vj$(EXESUFFIX)