From 16b89b20a1d524961c00d1a5b1c4f52f054ae057 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 4 May 2015 19:14:14 -0700 Subject: [PATCH] win32 includes no longer used --- Makefile.am | 1 - arch/win32/{include => oldinclude}/d3dhelp.h | 0 arch/win32/{include => oldinclude}/debug.h | 0 arch/win32/{include => oldinclude}/ipx_mcast4.h | 0 arch/win32/{include => oldinclude}/ipx_udp.h | 0 arch/win32/{include => oldinclude}/joy.h | 0 arch/win32/{include => oldinclude}/key.h | 0 arch/win32/{include => oldinclude}/mouse.h | 0 arch/win32/{include => oldinclude}/pch.h | 0 arch/win32/{include => oldinclude}/resource.h | 0 arch/win32/{include => oldinclude}/scene.h | 0 arch/win32/{include => oldinclude}/serial.h | 0 arch/win32/{include => oldinclude}/texture.h | 0 arch/win32/{include => oldinclude}/winmain.h | 0 arch/win32/{include => oldinclude}/wsipx.h | 0 d2x.xcodeproj/project.pbxproj | 3 ++- 16 files changed, 2 insertions(+), 2 deletions(-) rename arch/win32/{include => oldinclude}/d3dhelp.h (100%) rename arch/win32/{include => oldinclude}/debug.h (100%) rename arch/win32/{include => oldinclude}/ipx_mcast4.h (100%) rename arch/win32/{include => oldinclude}/ipx_udp.h (100%) rename arch/win32/{include => oldinclude}/joy.h (100%) rename arch/win32/{include => oldinclude}/key.h (100%) rename arch/win32/{include => oldinclude}/mouse.h (100%) rename arch/win32/{include => oldinclude}/pch.h (100%) rename arch/win32/{include => oldinclude}/resource.h (100%) rename arch/win32/{include => oldinclude}/scene.h (100%) rename arch/win32/{include => oldinclude}/serial.h (100%) rename arch/win32/{include => oldinclude}/texture.h (100%) rename arch/win32/{include => oldinclude}/winmain.h (100%) rename arch/win32/{include => oldinclude}/wsipx.h (100%) diff --git a/Makefile.am b/Makefile.am index 0ee1aa36..05d2e9f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,6 @@ d2x_sdl_LDFLAGS = $(d2x_LDFLAGS) d2x_sdl_LDADD = $(d2x_LDADD) $(SDL_LIBS) $(SDLIMAGE_LIBS) $(SDLMIXER_LIBS) if MINGW32 -d2x_sdl_CPPFLAGS += -I$(top_srcdir)/arch/win32/include _d2x_sdl_SOURCES += arch/win32/mingw_init.c _d2x_sdl_SOURCES += arch/sdl/joy.c arch/sdl/joydefs.c d2x_sdl_LDADD += -lwinmm diff --git a/arch/win32/include/d3dhelp.h b/arch/win32/oldinclude/d3dhelp.h similarity index 100% rename from arch/win32/include/d3dhelp.h rename to arch/win32/oldinclude/d3dhelp.h diff --git a/arch/win32/include/debug.h b/arch/win32/oldinclude/debug.h similarity index 100% rename from arch/win32/include/debug.h rename to arch/win32/oldinclude/debug.h diff --git a/arch/win32/include/ipx_mcast4.h b/arch/win32/oldinclude/ipx_mcast4.h similarity index 100% rename from arch/win32/include/ipx_mcast4.h rename to arch/win32/oldinclude/ipx_mcast4.h diff --git a/arch/win32/include/ipx_udp.h b/arch/win32/oldinclude/ipx_udp.h similarity index 100% rename from arch/win32/include/ipx_udp.h rename to arch/win32/oldinclude/ipx_udp.h diff --git a/arch/win32/include/joy.h b/arch/win32/oldinclude/joy.h similarity index 100% rename from arch/win32/include/joy.h rename to arch/win32/oldinclude/joy.h diff --git a/arch/win32/include/key.h b/arch/win32/oldinclude/key.h similarity index 100% rename from arch/win32/include/key.h rename to arch/win32/oldinclude/key.h diff --git a/arch/win32/include/mouse.h b/arch/win32/oldinclude/mouse.h similarity index 100% rename from arch/win32/include/mouse.h rename to arch/win32/oldinclude/mouse.h diff --git a/arch/win32/include/pch.h b/arch/win32/oldinclude/pch.h similarity index 100% rename from arch/win32/include/pch.h rename to arch/win32/oldinclude/pch.h diff --git a/arch/win32/include/resource.h b/arch/win32/oldinclude/resource.h similarity index 100% rename from arch/win32/include/resource.h rename to arch/win32/oldinclude/resource.h diff --git a/arch/win32/include/scene.h b/arch/win32/oldinclude/scene.h similarity index 100% rename from arch/win32/include/scene.h rename to arch/win32/oldinclude/scene.h diff --git a/arch/win32/include/serial.h b/arch/win32/oldinclude/serial.h similarity index 100% rename from arch/win32/include/serial.h rename to arch/win32/oldinclude/serial.h diff --git a/arch/win32/include/texture.h b/arch/win32/oldinclude/texture.h similarity index 100% rename from arch/win32/include/texture.h rename to arch/win32/oldinclude/texture.h diff --git a/arch/win32/include/winmain.h b/arch/win32/oldinclude/winmain.h similarity index 100% rename from arch/win32/include/winmain.h rename to arch/win32/oldinclude/winmain.h diff --git a/arch/win32/include/wsipx.h b/arch/win32/oldinclude/wsipx.h similarity index 100% rename from arch/win32/include/wsipx.h rename to arch/win32/oldinclude/wsipx.h diff --git a/d2x.xcodeproj/project.pbxproj b/d2x.xcodeproj/project.pbxproj index b9178713..5bd61b5e 100644 --- a/d2x.xcodeproj/project.pbxproj +++ b/d2x.xcodeproj/project.pbxproj @@ -1674,7 +1674,8 @@ 146695D31A2729860070D41D /* winmain.h */, 146695D41A2729860070D41D /* wsipx.h */, ); - path = include; + name = include; + path = oldinclude; sourceTree = ""; }; 1466960A1A2729860070D41D /* iff */ = { -- 2.39.2