Added a convenience header for jheretic.h (I wish I had thought of th…

…is before inserting ../../jheretic/include everywhere...). Also continued updating the Xcode project.
skyjake · Jun 13, 2006 · f3516a9 · f3516a9
1 parent b408b36
commit f3516a9
Show file tree

Hide file tree

Showing 101 changed files with 376 additions and 731 deletions.
diff --git a/doomsday/build/mac/Doomsday.xcodeproj/project.pbxproj b/doomsday/build/mac/Doomsday.xcodeproj/project.pbxproj
diff --git a/doomsday/engine/portable/include/de_base.h b/doomsday/engine/portable/include/de_base.h
@@ -30,10 +30,13 @@
 #include "dd_wad.h"
 #include "dd_zone.h"
 #include "dd_main.h"
-#include "dd_winit.h"
 #include "dd_input.h"
 #include "dd_loop.h"
 #include "dd_help.h"
 #include "dd_zip.h"
 
+#ifdef WIN32
+#  include "dd_winit.h"
+#endif
+
 #endif
diff --git a/doomsday/engine/portable/include/net_main.h b/doomsday/engine/portable/include/net_main.h
@@ -23,7 +23,7 @@
 #define __DOOMSDAY_NETWORK_H__
 
 #include <stdio.h>
-#include "LZSS.h"
+#include "lzss.h"
 #include "dd_share.h"
 #include "sys_network.h"
 #include "net_msg.h"

diff --git a/doomsday/plugins/common/include/am_map.h b/doomsday/plugins/common/include/am_map.h
@@ -27,7 +27,7 @@
 
 // DJS - Common\f_infine.c is calling here when compiling jHexen looking for this...
 #ifdef __JHEXEN__
-#include "p_local.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #include "p_local.h"
 #endif

diff --git a/doomsday/plugins/common/include/d_netsv.h b/doomsday/plugins/common/include/d_netsv.h
@@ -6,11 +6,11 @@
 #endif
 
 #ifdef __JHERETIC__
-#include "../../jheretic/include/p_local.h"
+#include "jheretic.h"
 #endif
 
 #ifdef __JHEXEN__
-#include "p_local.h"
+#include "jhexen.h"
 #endif
 
 #ifdef __JSTRIFE__

diff --git a/doomsday/plugins/common/include/g_common.h b/doomsday/plugins/common/include/g_common.h
@@ -6,9 +6,9 @@
 #if __JDOOM__
 # include "p_mobj.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/p_mobj.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
+# include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 #endif

diff --git a/doomsday/plugins/common/include/hu_msg.h b/doomsday/plugins/common/include/hu_msg.h
@@ -5,11 +5,9 @@
 #  include "d_event.h"
 #  include "r_defs.h"
 #elif __JHERETIC__
-#  include "h_event.h"
-#  include "r_defs.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
-#  include "h2def.h"
-#  include "r_local.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #  include "h2def.h"
 #  include "r_local.h"

diff --git a/doomsday/plugins/common/include/hu_stuff.h b/doomsday/plugins/common/include/hu_stuff.h
@@ -27,8 +27,7 @@
 # include "d_event.h"
 # include "r_defs.h"
 #elif __JHERETIC__
-# include "h_event.h"
-# include "../../jheretic/include/r_defs.h"
+//# include "jheretic.h"
 #elif __JHEXEN__
 //#include "jHexen/mn_def.h"
 

diff --git a/doomsday/plugins/common/src/am_map.c b/doomsday/plugins/common/src/am_map.c
@@ -39,24 +39,9 @@
 # include "m_menu.h"
 # include "wi_stuff.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/m_ctrl.h"
-# include "../../jheretic/include/doomdef.h"
-# include "h_config.h"
-# include "../../jheretic/include/st_stuff.h"
-# include "../../jheretic/include/p_local.h"
-# include "../../jheretic/include/m_cheat.h"
-# include "h_action.h"
-# include "h_stat.h"
-# include "../../jheretic/include/dstrings.h"
-# include "../../jheretic/include/mn_def.h"
-# include "../../jheretic/include/m_menu.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "m_ctrl.h"
-# include "h2_actn.h"
-# include "mn_def.h"
-# include "h2def.h"
-# include "x_config.h"
-# include "st_stuff.h"
+# include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2_actn.h"
 # include "mn_def.h"

diff --git a/doomsday/plugins/common/src/d_net.c b/doomsday/plugins/common/src/d_net.c
@@ -33,19 +33,9 @@
 #  include "hu_stuff.h"
 #  include "st_stuff.h"
 #elif __JHERETIC__
-#  include "../../jheretic/include/doomdef.h"
-#  include "h_stat.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "sounds.h"
-#  include "../../jheretic/include/g_game.h"
-#  include "../../jheretic/include/m_menu.h"
-#  include "h_config.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
-#  include "h2def.h"
-#  include "p_local.h"
-#  include "soundst.h"
-#  include "mn_def.h"
-#  include "x_config.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #  include "h2def.h"
 #  include "p_local.h"

diff --git a/doomsday/plugins/common/src/d_netcl.c b/doomsday/plugins/common/src/d_netcl.c
@@ -28,17 +28,9 @@
 #  include "st_stuff.h"
 #  include "wi_stuff.h"
 #elif __JHERETIC__
-#  include "../../jheretic/include/doomdef.h"
-#  include "h_stat.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "soundst.h"
-#  include "h_config.h"
-#  include "../../jheretic/include/g_game.h"
-#  include "../../jheretic/include/st_stuff.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
-#  include "h2def.h"
-#  include "p_local.h"
-#  include "x_config.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #  include "h2def.h"
 #  include "p_local.h"

diff --git a/doomsday/plugins/common/src/d_netsv.c b/doomsday/plugins/common/src/d_netsv.c
@@ -31,16 +31,9 @@
 #  include "m_cheat.h"
 #  include "g_common.h"
 #elif __JHERETIC__
-#  include "../../jheretic/include/doomdef.h"
-#  include "h_stat.h"
-#  include "sounds.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "h_config.h"
-#  include "../../jheretic/include/m_cheat.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
-#  include "h2def.h"
-#  include "p_local.h"
-#  include "x_config.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #  include "h2def.h"
 #  include "p_local.h"

diff --git a/doomsday/plugins/common/src/dmu_lib.c b/doomsday/plugins/common/src/dmu_lib.c
@@ -24,9 +24,9 @@
 #ifdef __JDOOM__
 # include "r_defs.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/r_defs.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "r_local.h"
+# include "jhexen.h"
 #endif
 
 #include "dmu_lib.h"

diff --git a/doomsday/plugins/common/src/f_infine.c b/doomsday/plugins/common/src/f_infine.c
@@ -28,14 +28,9 @@
 # include "doomstat.h"
 # include "s_sound.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_stat.h"
-# include "soundst.h"
-# include "am_map.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "x_config.h"
-# include "am_map.h"
+# include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 # include "d_config.h"

diff --git a/doomsday/plugins/common/src/g_controls.c b/doomsday/plugins/common/src/g_controls.c
@@ -28,17 +28,9 @@
 #  include "p_local.h"
 #  include "m_ctrl.h"
 #elif __JHERETIC__
-#  include "../../jheretic/include/doomdef.h"
-#  include "h_stat.h"
-#  include "h_config.h"
-#  include "h_player.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "../../jheretic/include/m_ctrl.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
-#  include "h2def.h"
-#  include "x_config.h"
-#  include "p_local.h"
-#  include "m_ctrl.h"
+#  include "jhexen.h"
 #endif
 
 // MACROS ------------------------------------------------------------------

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -37,28 +37,12 @@
 #  include <stdio.h>
 #  include <string.h>
 #  include <math.h>
-#  include "../../jheretic/include/doomdef.h"
-#  include "h_stat.h"
-#  include "h_action.h"
-#  include "h_config.h"
-#  include "../../jheretic/include/m_menu.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "soundst.h"
-#  include "../../jheretic/include/dstrings.h"
-#  include "../../jheretic/include/g_game.h"
-#  include "../../jheretic/include/st_stuff.h"
-#  include "p_saveg.h"
+#  include "jheretic.h"
 #elif __JHEXEN__
 #  include <string.h>
 #  include <math.h>
 #  include <assert.h>
-#  include "h2def.h"
-#  include "p_local.h"
-#  include "soundst.h"
-#  include "x_config.h"
-#  include "h2_actn.h"
-#  include "st_stuff.h"
-#  include "mn_def.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 #  include <string.h>
 #  include <math.h>

diff --git a/doomsday/plugins/common/src/g_update.c b/doomsday/plugins/common/src/g_update.c
@@ -31,16 +31,9 @@
 # include "dstrings.h"
 # include "s_sound.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_stat.h"
-# include "../../jheretic/include/p_local.h"
-# include "../../jheretic/include/m_menu.h"
-# include "../../jheretic/include/dstrings.h"
-# include "soundst.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "p_local.h"
-# include "st_stuff.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 # include "p_local.h"

diff --git a/doomsday/plugins/common/src/hu_lib.c b/doomsday/plugins/common/src/hu_lib.c
@@ -27,13 +27,9 @@
 # include "d_config.h"
 # include "r_local.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_config.h"
-# include "../../jheretic/include/r_local.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "x_config.h"
-# include "r_local.h"
+# include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 # include "d_config.h"

diff --git a/doomsday/plugins/common/src/hu_msg.c b/doomsday/plugins/common/src/hu_msg.c
@@ -34,25 +34,9 @@
 # include "m_ctrl.h"
 # include "dstrings.h"  // Data.
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_config.h"
-# include "../../jheretic/include/m_menu.h"
-# include "../../jheretic/include/mn_def.h"
-# include "../../jheretic/include/soundst.h"
-# include "h_stat.h"
-# include "../../jheretic/include/r_local.h"
-# include "../../jheretic/include/p_local.h"
-# include "../../jheretic/include/m_ctrl.h"
-# include "../../jheretic/include/dstrings.h"  // Data.
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "x_config.h"
-# include "mn_def.h"
-# include "sounds.h"
-# include "r_local.h"
-# include "p_local.h"
-# include "m_ctrl.h"
-# include "textdefs.h"  // Data.
+# include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 # include "d_config.h"

diff --git a/doomsday/plugins/common/src/hu_pspr.c b/doomsday/plugins/common/src/hu_pspr.c
@@ -25,14 +25,9 @@
 # include "d_config.h"
 # include "st_stuff.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_stat.h"
-# include "../../jheretic/include/p_local.h"
-# include "h_config.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "x_config.h"
-# include "p_local.h"
+#  include "jhexen.h"
 #elif __JSTRIFE__
 # include "h2def.h"
 # include "d_config.h"

diff --git a/doomsday/plugins/common/src/hu_stuff.c b/doomsday/plugins/common/src/hu_stuff.c
@@ -37,11 +37,7 @@
 # include "d_config.h"
 # include "dstrings.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/mn_def.h"
-# include "../../jheretic/include/m_menu.h"
-# include "h_stat.h"
-# include "../../jheretic/include/p_local.h"
-# include "h_config.h"
+# include "jheretic.h"
 #elif __JHEXEN__
 # include "h2def.h"
 # include "mn_def.h"

diff --git a/doomsday/plugins/common/src/m_ctrl.c b/doomsday/plugins/common/src/m_ctrl.c
@@ -33,22 +33,9 @@
 # include "d_config.h"
 # include "m_ctrl.h"
 #elif __JHERETIC__
-# include "../../jheretic/include/doomdef.h"
-# include "h_stat.h"
-# include "../../jheretic/include/m_menu.h"
-# include "../../jheretic/include/mn_def.h"
-# include "h_action.h"
-# include "h_config.h"
-# include "../../jheretic/include/g_game.h"
-# include "h_config.h"
-# include "../../jheretic/include/m_ctrl.h"
+# include "jheretic.h"
 #elif __JHEXEN__
-# include "h2def.h"
-# include "mn_def.h"
-# include "h2_actn.h"
-# include "x_config.h"
-# include "hu_stuff.h"
-# include "m_ctrl.h"
+# include "jhexen.h"
 #endif
 
 // MACROS ------------------------------------------------------------------

diff --git a/doomsday/plugins/common/src/m_multi.c b/doomsday/plugins/common/src/m_multi.c
@@ -32,18 +32,9 @@
 #  include "p_local.h"
 #  include "mn_def.h"
 #elif defined __JHERETIC__
-#  include "../../jheretic/include/doomdef.h"
-#  include "../../jheretic/include/m_menu.h"
-#  include "h_config.h"
-#  include "soundst.h"
-#  include "../../jheretic/include/p_local.h"
-#  include "../../jheretic/include/mn_def.h"
+#  include "jheretic.h"
 #elif defined __JHEXEN__
-#  include "h2def.h"
-#  include "x_config.h"
-#  include "soundst.h"
-#  include "p_local.h"
-#  include "mn_def.h"
+#  include "jhexen.h"
 #elif defined __JSTRIFE__
 #  include "h2def.h"
 #  include "d_config.h"