Fixed up FTBFS with WolfTC.

skyjake · Aug 9, 2006 · 5d955f3 · 5d955f3
1 parent d8a130e
commit 5d955f3
Show file tree

Hide file tree

Showing 71 changed files with 383 additions and 308 deletions.
diff --git a/doomsday/build/win32/vcbuild.bat b/doomsday/build/win32/vcbuild.bat
@@ -225,7 +225,7 @@ GOTO Done
 :WolfTC
 ECHO Compiling WolfTC.dll (WolfTC Game Library)...
 md %OBJ_DIR%\WolfTC
-cl /O2 /Ob1 %INCS_PLUGIN_COMMON% %INCS_ENGINE_API% %INCS_LZSS_PORTABLE% /I "./../../plugins/wolftc/include" /D "__WOLFTC__" /D "__JDOOM__" %DLLDEFINES% /D "WOLFTC_EXPORTS" /GF /FD /EHsc /MT /Gy /Fo"./%OBJ_DIR%/WolfTC/" /Fd"./%OBJ_DIR%/WolfTC/" /W3 /Gz  @wolftc_cl.rsp  /link  /OUT:"./%BIN_DIR%/WolfTC.dll" %LFLAGS% /LIBPATH:"./Lib" /DLL /DEF:"./../../plugins/jdoom/api/wolftc.def" /IMPLIB:"./%BIN_DIR%/WolfTC.lib" ./%BIN_DIR%/doomsday.lib %EXTERNAL%/lzss/win32/lzss.lib
+cl /O2 /Ob1 %INCS_PLUGIN_COMMON% %INCS_ENGINE_API% %INCS_LZSS_PORTABLE% /I "./../../plugins/wolftc/include" /D "__WOLFTC__" /D "__JDOOM__" %DLLDEFINES% /D "WOLFTC_EXPORTS" /GF /FD /EHsc /MT /Gy /Fo"./%OBJ_DIR%/WolfTC/" /Fd"./%OBJ_DIR%/WolfTC/" /W3 /Gz  @wolftc_cl.rsp  /link  /OUT:"./%BIN_DIR%/WolfTC.dll" %LFLAGS% /LIBPATH:"./Lib" /DLL /DEF:"./../../plugins/wolftc/api/wolftc.def" /IMPLIB:"./%BIN_DIR%/WolfTC.lib" ./%BIN_DIR%/doomsday.lib %EXTERNAL%/lzss/win32/lzss.lib
 GOTO Done
 
 

diff --git a/doomsday/build/win32/wolftc_cl.rsp b/doomsday/build/win32/wolftc_cl.rsp
@@ -3,7 +3,6 @@
  ./../../plugins/common/src/d_net.c
  ./../../plugins/common/src/dmu_lib.c
  ./../../plugins/common/src/m_multi.c
- ./../../plugins/common/src/mn_main.c
  ./../../plugins/common/src/mn_menu.c
  ./../../plugins/wolftc/src/g_ctrl.c
  ./../../plugins/common/src/m_ctrl.c

diff --git a/doomsday/plugins/common/include/d_netsv.h b/doomsday/plugins/common/include/d_netsv.h
@@ -1,7 +1,9 @@
 #ifndef __NETSV_H__
 #define __NETSV_H__
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/include/g_common.h b/doomsday/plugins/common/include/g_common.h
@@ -3,7 +3,9 @@
 
 #include "dd_share.h"
 
-#if __JDOOM__
+#if   __WOLFTC__
+# include "wolftc.h"
+#elif __JDOOM__
 # include "jdoom.h"
 #elif __JHERETIC__
 # include "jheretic.h"

diff --git a/doomsday/plugins/common/include/hu_msg.h b/doomsday/plugins/common/include/hu_msg.h
@@ -1,7 +1,9 @@
 #ifndef __HUD_MESSAGES_H__
 #define __HUD_MESSAGES_H__
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/include/p_player.h b/doomsday/plugins/common/include/p_player.h
@@ -20,7 +20,9 @@
  * p_player.h: Common playsim routines relating to players.
  */
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/am_map.c b/doomsday/plugins/common/src/am_map.c
@@ -25,7 +25,9 @@
 #include <math.h>
 #include <ctype.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/d_net.c b/doomsday/plugins/common/src/d_net.c
@@ -24,7 +24,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/d_netcl.c b/doomsday/plugins/common/src/d_netcl.c
@@ -21,7 +21,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/d_netsv.c b/doomsday/plugins/common/src/d_netsv.c
@@ -23,7 +23,9 @@
 
 #include <ctype.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/dmu_lib.c b/doomsday/plugins/common/src/dmu_lib.c
@@ -21,7 +21,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/f_infine.c b/doomsday/plugins/common/src/f_infine.c
@@ -23,7 +23,9 @@
 
 #include <ctype.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/g_controls.c b/doomsday/plugins/common/src/g_controls.c
@@ -20,7 +20,9 @@
 
 #include <math.h> // required for sqrt, fabs
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -21,7 +21,13 @@
 // HEADER FILES ------------------------------------------------------------
 #include <ctype.h>
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include <string.h>
+#  include <stdlib.h>
+#  include <math.h>
+#  include "wolftc.h"
+#  include "p_saveg.h"
+#elif __JDOOM__
 #  include <string.h>
 #  include <stdlib.h>
 #  include <math.h>

diff --git a/doomsday/plugins/common/src/g_update.c b/doomsday/plugins/common/src/g_update.c
@@ -22,7 +22,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/hu_lib.c b/doomsday/plugins/common/src/hu_lib.c
@@ -21,7 +21,9 @@
 
 #include <ctype.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/hu_msg.c b/doomsday/plugins/common/src/hu_msg.c
@@ -22,7 +22,9 @@
 
 #include <ctype.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/hu_pspr.c b/doomsday/plugins/common/src/hu_pspr.c
@@ -18,7 +18,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/hu_stuff.c b/doomsday/plugins/common/src/hu_stuff.c
@@ -26,7 +26,9 @@
 #include <ctype.h>
 #include <math.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/m_ctrl.c b/doomsday/plugins/common/src/m_ctrl.c
@@ -21,7 +21,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/m_multi.c b/doomsday/plugins/common/src/m_multi.c
@@ -24,7 +24,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/mn_menu.c b/doomsday/plugins/common/src/mn_menu.c
@@ -34,7 +34,10 @@
 #  include <lzss.h>
 #endif
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#  include "p_saveg.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #  include "p_saveg.h"
 #elif __JHERETIC__

diff --git a/doomsday/plugins/common/src/p_actor.c b/doomsday/plugins/common/src/p_actor.c
@@ -22,7 +22,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_mapsetup.c b/doomsday/plugins/common/src/p_mapsetup.c
@@ -29,7 +29,9 @@
 # endif
 #endif
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_player.c b/doomsday/plugins/common/src/p_player.c
@@ -26,7 +26,9 @@
 
 #include "dd_share.h"
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_saveg.c b/doomsday/plugins/common/src/p_saveg.c
@@ -21,13 +21,15 @@
  * Compiles for jDoom and jHeretic
  */
 
-#if __JDOOM__ || __JHERETIC__
+#if __JDOOM__ || __WOLFTC__ || __JHERETIC__
 
 // HEADER FILES ------------------------------------------------------------
 
 #include <lzss.h>
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_start.c b/doomsday/plugins/common/src/p_start.c
@@ -20,7 +20,11 @@
 
 #include <math.h>
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#  include "r_common.h"
+#  include "hu_stuff.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #  include "r_common.h"
 #  include "hu_stuff.h"

diff --git a/doomsday/plugins/common/src/p_svtexarc.c b/doomsday/plugins/common/src/p_svtexarc.c
@@ -17,7 +17,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_tick.c b/doomsday/plugins/common/src/p_tick.c
@@ -21,7 +21,9 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#ifdef __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_user.c b/doomsday/plugins/common/src/p_user.c
@@ -33,7 +33,10 @@
 #  include <math.h>
 #endif
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#  include "g_common.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #  include "g_common.h"
 #elif __JHERETIC__

diff --git a/doomsday/plugins/common/src/p_view.c b/doomsday/plugins/common/src/p_view.c
@@ -17,7 +17,10 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#  include "g_common.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #  include "g_common.h"
 #elif __JHERETIC__

diff --git a/doomsday/plugins/common/src/p_xgfile.c b/doomsday/plugins/common/src/p_xgfile.c
@@ -22,13 +22,15 @@
  * Compiles for jDoom and jHeretic
  */
 
-#if __JDOOM__ || __JHERETIC__
+#if __JDOOM__ || __WOLFTC__ || __JHERETIC__
 
 // HEADER FILES ------------------------------------------------------------
 
 #include <stdio.h>
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"

diff --git a/doomsday/plugins/common/src/p_xgline.c b/doomsday/plugins/common/src/p_xgline.c
@@ -22,7 +22,7 @@
  * Compiles for jDoom and jHeretic
  */
 
-#if __JDOOM__ || __JHERETIC__
+#if __JDOOM__ || __WOLFTC__|| __JHERETIC__
 
 // HEADER FILES ------------------------------------------------------------
 
@@ -31,7 +31,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#if __JDOOM__
+#if   __WOLFTC__
+#  include "wolftc.h"
+#elif __JDOOM__
 #  include "jdoom.h"
 #elif __JHERETIC__
 #  include "jheretic.h"