build: move all header files to fdpp [dosemu2#16]

john-peterson · Jul 18, 2018 · 69e5f90 · 69e5f90
1 parent 75a2284
commit 69e5f90
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 4 deletions.
diff --git a/hdr/dosobj.h → fdpp/dosobj.h b/hdr/dosobj.h → fdpp/dosobj.h
diff --git a/hdr/dosobj_priv.h → fdpp/dosobj_priv.h b/hdr/dosobj_priv.h → fdpp/dosobj_priv.h
diff --git a/hdr/farhlp.h → fdpp/farhlp.h b/hdr/farhlp.h → fdpp/farhlp.h
diff --git a/hdr/farobj.hpp → fdpp/farobj.hpp b/hdr/farobj.hpp → fdpp/farobj.hpp
diff --git a/hdr/farptr.hpp → fdpp/farptr.hpp b/hdr/farptr.hpp → fdpp/farptr.hpp
diff --git a/fdpp/makefile b/fdpp/makefile
@@ -78,8 +78,8 @@ HDRS=\
     $(HDR)dirmatch.h $(HDR)file.h $(HDR)clock.h $(HDR)kbd.h $(HDR)error.h  \
     $(HDR)version.h $(SRC)dyndata.h
 PLPHDRS = $(wildcard $(HDR)*.hpp)
-PPHDRS = $(PLPHDRS) $(HDR)dosobj.h $(HDR)dosobj_priv.h $(HDR)farhlp.h \
-    $(HDR)thunks_priv.h thunks.h smalloc.h
+PPHDRS = $(PLPHDRS) dosobj.h dosobj_priv.h farhlp.h \
+    thunks_priv.h thunks.h smalloc.h
 GEN_HEADERS=thunk_calls.h thunk_asms.h glob_asmdefs.h
 GEN_ASMS=plt.asm cdata.asm
 GEN_CC = $(CFILES:.c=.cc)

diff --git a/hdr/malloca.hpp → fdpp/malloca.hpp b/hdr/malloca.hpp → fdpp/malloca.hpp
diff --git a/hdr/objhlp.hpp → fdpp/objhlp.hpp b/hdr/objhlp.hpp → fdpp/objhlp.hpp
diff --git a/hdr/thunks_priv.h → fdpp/thunks_priv.h b/hdr/thunks_priv.h → fdpp/thunks_priv.h
diff --git a/hdr/portab.h b/hdr/portab.h
@@ -252,8 +252,6 @@ void RelocHook(UWORD old_seg, UWORD new_seg, UDWORD len);
 #define NORETURN
 #define DEBUG
 
-#include "dosobj.h"
-
 #else
 #error Unknown compiler
 We might even deal with a pre-ANSI compiler. This will certainly not compile.