From 18179bcf48be3bd65fcdeac74586e0a2a7e68925 Mon Sep 17 00:00:00 2001
From: Lance <moodles2@users.sourceforge.net>
Date: Sat, 29 Oct 2011 04:06:49 +0000
Subject: [PATCH] .cpp handling in makefile added, lowercase'd an include file
 in sys_axfte

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3915 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/Makefile             | 12 +++++++++++-
 engine/client/sys_axfte.cpp |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index ae0ce0c48..f25094370 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -664,7 +664,7 @@ ifeq ($(shell echo $(FTE_TARGET)|grep -E -v "win(32|64)$$"),)
 	GLB_DIR=gl_mgw$(BITS)
 	GLCL_DIR=glcl_mgw$(BITS)
 
-	NPFTECL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_npfte.o sys_plugfte.o $(LTO_END) npplug.o ../../ftequake/npapi.def $(LTO_START)
+	NPFTECL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_npfte.o sys_axfte.o sys_plugfte.o $(LTO_END) npplug.o ../../ftequake/npapi.def $(LTO_START)
 	NPFTE_DLL_NAME=../npfte$(BITS).dll
 	NPFTECL_DLL_NAME=../npftecl$(BITS).dll
 	NPFTE_LDFLAGS=--enable-stdcall-fixup $(GLLDFLAGS) $(IMAGELDFLAGS) -ldxguid -lws2_32 -lwinmm -lgdi32 -lole32 -shared
@@ -924,6 +924,16 @@ ifeq ($(NODEPS),)
 endif
 	$(DO_CC) -I$(OUT_DIR)
 
+$(OUT_DIR)/%.o $(OUT_DIR)/%.d : %.cpp
+ifeq ($(NODEPS),)
+	@set -e; rm -f $@.d; \
+	$(CC) -MM $(ALL_CFLAGS) $< > $@.d.$$$$; \
+	sed 's,\($*\)\.o[ :]*,$@ $@.d : ,g' < $@.d.$$$$ > $@.d; \
+	sed -e 's/.*://' -e 's/\\$$//' < $@.d.$$$$ | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $@.d; \
+	rm -f $@.d.$$$$
+endif
+	$(DO_CC) -I$(OUT_DIR)
+
 $(OUT_DIR)/%.oo $(OUT_DIR)/%.d : %.c
 ifeq ($(NODEPS),)
 	@set -e; rm -f $@.d; \
diff --git a/engine/client/sys_axfte.cpp b/engine/client/sys_axfte.cpp
index 7ca794491..c72afc144 100644
--- a/engine/client/sys_axfte.cpp
+++ b/engine/client/sys_axfte.cpp
@@ -6,7 +6,7 @@
 #include <objsafe.h>	/*IObjectSafety*/
 #include <mshtmdid.h>	/*DISPID_SECURITYCTX*/
 
-#include <OleCtl.h> /*common dispid values*/
+#include <olectl.h> /*common dispid values*/
 
 const GUID axfte_iid = {0x7d676c9f, 0xfb84, 0x40b6, {0xb3, 0xff, 0xe1, 0x08, 0x31, 0x55, 0x7e, 0xeb}};
 #define axfte_iid_str "7d676c9f-fb84-40b6-b3ff-e10831557eeb"