Further Xcode and Mac compilation fixes. Also some missing includes w…

…ere added.
skyjake · Jun 13, 2006 · b74534d · b74534d
1 parent 22d0f63
commit b74534d
Show file tree

Hide file tree

Showing 25 changed files with 79 additions and 22 deletions.
diff --git a/doomsday/build/mac/Doomsday.xcodeproj/project.pbxproj b/doomsday/build/mac/Doomsday.xcodeproj/project.pbxproj
@@ -233,6 +233,8 @@
 		B0C8F4560A3F112400CFA4A5 /* StartupWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = B0C8F4530A3F112400CFA4A5 /* StartupWindowController.h */; };
 		B0C8F81B0A3F380200CFA4A5 /* p_acs.c in Sources */ = {isa = PBXBuildFile; fileRef = B0C8F81A0A3F380200CFA4A5 /* p_acs.c */; };
 		B0C8FB1A0A3F474F00CFA4A5 /* mus2midi.c in Sources */ = {isa = PBXBuildFile; fileRef = B0C8FB190A3F474F00CFA4A5 /* mus2midi.c */; };
+		B0C8FB470A3F4B4E00CFA4A5 /* sys_console.h in Headers */ = {isa = PBXBuildFile; fileRef = B0C8FB460A3F4B4E00CFA4A5 /* sys_console.h */; };
+		B0C8FBEA0A3F4DEF00CFA4A5 /* dd_uinit.h in Headers */ = {isa = PBXBuildFile; fileRef = B0C8FBE90A3F4DEF00CFA4A5 /* dd_uinit.h */; };
 		B0CB90BB078B393C007EE194 /* driver.h in Resources */ = {isa = PBXBuildFile; fileRef = B0CB90BA078B393C007EE194 /* driver.h */; };
 		B0CB90EE078B3DCD007EE194 /* qt.c in Sources */ = {isa = PBXBuildFile; fileRef = B0CB90ED078B3DCD007EE194 /* qt.c */; };
 		B0CB9107078B4FFB007EE194 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B0CB9105078B4FFB007EE194 /* Carbon.framework */; };
@@ -1088,7 +1090,7 @@
 		B02AC8B406B41788005824AD /* ui_main.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ui_main.c; path = ../../engine/portable/src/ui_main.c; sourceTree = SOURCE_ROOT; };
 		B02AC8B506B41788005824AD /* ui_mpi.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ui_mpi.c; path = ../../engine/portable/src/ui_mpi.c; sourceTree = SOURCE_ROOT; };
 		B02AC8B606B41788005824AD /* ui_panel.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ui_panel.c; path = ../../engine/portable/src/ui_panel.c; sourceTree = SOURCE_ROOT; };
-		B02AC8B906B41788005824AD /* lzss.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = lzss.c; path = ../../engine/unix/src/lzss.c; sourceTree = SOURCE_ROOT; };
+		B02AC8B906B41788005824AD /* lzss.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = lzss.c; path = ../../external/lzss/unix/src/lzss.c; sourceTree = SOURCE_ROOT; };
 		B02AC8BA06B41788005824AD /* sys_console.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = sys_console.c; path = ../../engine/unix/src/sys_console.c; sourceTree = SOURCE_ROOT; };
 		B02AC8BB06B41788005824AD /* sys_findfile.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = sys_findfile.c; path = ../../engine/unix/src/sys_findfile.c; sourceTree = SOURCE_ROOT; };
 		B02AC8BC06B41788005824AD /* sys_input.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = sys_input.c; path = ../../engine/unix/src/sys_input.c; sourceTree = SOURCE_ROOT; };
@@ -1153,6 +1155,8 @@
 		B0C8F9660A3F412D00CFA4A5 /* m_menu.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = m_menu.h; path = ../../plugins/jheretic/include/m_menu.h; sourceTree = SOURCE_ROOT; };
 		B0C8FA9A0A3F457000CFA4A5 /* tables.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = tables.h; path = ../../plugins/jheretic/include/tables.h; sourceTree = SOURCE_ROOT; };
 		B0C8FB190A3F474F00CFA4A5 /* mus2midi.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = mus2midi.c; path = ../../plugins/sdlmixer/portable/src/mus2midi.c; sourceTree = SOURCE_ROOT; };
+		B0C8FB460A3F4B4E00CFA4A5 /* sys_console.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = sys_console.h; path = ../../engine/portable/include/sys_console.h; sourceTree = SOURCE_ROOT; };
+		B0C8FBE90A3F4DEF00CFA4A5 /* dd_uinit.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = dd_uinit.h; path = ../../engine/unix/include/dd_uinit.h; sourceTree = SOURCE_ROOT; };
 		B0CB90BA078B393C007EE194 /* driver.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = driver.h; path = ../../plugins/sdlmixer/portable/include/driver.h; sourceTree = SOURCE_ROOT; };
 		B0CB90ED078B3DCD007EE194 /* qt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = qt.c; path = ../../plugins/sdlmixer/mac/src/qt.c; sourceTree = SOURCE_ROOT; };
 		B0CB9105078B4FFB007EE194 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
@@ -1774,6 +1778,8 @@
 		B02AC73506B3FBD4005824AD /* Headers */ = {
 			isa = PBXGroup;
 			children = (
+				B0C8FBE90A3F4DEF00CFA4A5 /* dd_uinit.h */,
+				B0C8FB460A3F4B4E00CFA4A5 /* sys_console.h */,
 				B0346DC40A10F1B100C8BAB2 /* dd_maptypes.h */,
 				B0346DC50A10F1B100C8BAB2 /* de_edit.h */,
 				B0346DC60A10F1B100C8BAB2 /* edit_bias.h */,
@@ -2326,6 +2332,8 @@
 				B0C8F4540A3F112400CFA4A5 /* DoomsdayRunner.h in Headers */,
 				B0C8F4550A3F112400CFA4A5 /* SDLMain.h in Headers */,
 				B0C8F4560A3F112400CFA4A5 /* StartupWindowController.h in Headers */,
+				B0C8FB470A3F4B4E00CFA4A5 /* sys_console.h in Headers */,
+				B0C8FBEA0A3F4DEF00CFA4A5 /* dd_uinit.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4032,7 +4040,7 @@
 				HEADER_SEARCH_PATHS = (
 					../../engine/unix/include,
 					../../engine/portable/include,
-					../../external/lzss/include,
+					../../external/lzss/portable/include,
 					../../engine/api,
 					/sw/include/libpng12,
 					"$(HOME)/Library/Frameworks/SDL.framework/Headers",

diff --git a/doomsday/engine/mac/src/DoomsdayRunner.m b/doomsday/engine/mac/src/DoomsdayRunner.m
@@ -1,5 +1,5 @@
 #import "SDL.h"
-#import "DoomsdayRunner.h"
+#import "../include/DoomsdayRunner.h"
 
 @implementation DoomsdayRunner
 

diff --git a/doomsday/engine/mac/src/SDLMain.m b/doomsday/engine/mac/src/SDLMain.m
@@ -6,13 +6,13 @@
 */
 
 #import "SDL.h"
-#import "SDLMain.h"
+#import "../include/SDLMain.h"
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
 
 #import <AppKit/NSWindowController.h>
-#import "StartupWindowController.h"
-#import "DoomsdayRunner.h"
+#import "../include/StartupWindowController.h"
+#import "../include/DoomsdayRunner.h"
 
 /* Use this flag to determine whether we use SDLMain.nib or not */
 #define		SDL_USE_NIB_FILE	0

diff --git a/doomsday/engine/mac/src/StartupWindowController.m b/doomsday/engine/mac/src/StartupWindowController.m
@@ -1,4 +1,4 @@
-#import "StartupWindowController.h"
+#import "../include/StartupWindowController.h"
 
 @implementation StartupWindowController
 

diff --git a/doomsday/engine/portable/include/de_base.h b/doomsday/engine/portable/include/de_base.h
@@ -39,4 +39,8 @@
 #  include "dd_winit.h"
 #endif
 
+#ifdef UNIX
+#  include "dd_uinit.h"
+#endif
+
 #endif
diff --git a/doomsday/engine/portable/include/de_platform.h b/doomsday/engine/portable/include/de_platform.h
@@ -74,12 +74,12 @@ typedef unsigned int DWORD;
 #define DIR_SEP_STR			"/"
 #define DIR_WRONG_SEP_CHAR 	'\\'
 
-#include "Unix/sys_path.h"
+#include "../../unix/include/sys_path.h"
 
 /*
  * Replacements for the Win32 findfirst/next routines.
  */
-#include "Unix/sys_findfile.h"
+#include "../../unix/include/sys_findfile.h"
 
 #define _A_SUBDIR 	A_SUBDIR
 

diff --git a/doomsday/engine/portable/include/de_system.h b/doomsday/engine/portable/include/de_system.h
@@ -35,7 +35,7 @@
 #include "sys_stwin.h"
 
 #ifdef UNIX
-#  include "Unix/sys_path.h"
+#  include "../../unix/include/sys_path.h"
 #endif
 
 #endif
diff --git a/doomsday/engine/portable/include/sys_audio.h b/doomsday/engine/portable/include/sys_audio.h
@@ -27,10 +27,13 @@
 
 #include "sys_sfxd.h"
 #include "sys_sfxd_dummy.h"
-#include "sys_sfxd_ds.h"
 #include "sys_sfxd_loader.h"
 #include "sys_musd.h"
-#include "sys_musd_win.h"
-#include "sys_musd_fmod.h"
+
+#ifdef WIN32
+#  include "sys_sfxd_ds.h"
+#  include "sys_musd_win.h"
+#  include "sys_musd_fmod.h"
+#endif
 
 #endif
diff --git a/doomsday/engine/win32/include/sys_console.h → ...day/engine/portable/include/sys_console.h b/doomsday/engine/win32/include/sys_console.h → ...day/engine/portable/include/sys_console.h
diff --git a/doomsday/engine/portable/src/def_main.c b/doomsday/engine/portable/src/def_main.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 
 // XGClass.h is actually a part of the engine.
-#include "xgclass.h"
+#include "../../../plugins/common/include/xgclass.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/engine/portable/src/def_read.c b/doomsday/engine/portable/src/def_read.c
@@ -50,7 +50,7 @@
 #include "de_defs.h"
 
 // XGClass.h is actually a part of the engine.
-#include "xgclass.h"
+#include "../../../plugins/common/include/xgclass.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/engine/portable/src/m_misc.c b/doomsday/engine/portable/src/m_misc.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <math.h>
-#include <LZSS.h>
+#include "lzss.h"
 
 #include "de_base.h"
 #include "de_console.h"

diff --git a/doomsday/engine/unix/include/dd_uinit.h b/doomsday/engine/unix/include/dd_uinit.h
@@ -0,0 +1,29 @@
+/* DE1: $Id: dd_winit.h 3311 2006-06-11 17:36:34Z skyjake $
+ * Copyright (C) 2003, 2004 Jaakko Keränen <jaakko.keranen@iki.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not: http://www.opensource.org/
+ */
+
+/*
+ * dd_uinit.h: Unix Initialization
+ */
+
+#ifndef __DOOMSDAY_UINIT_H__
+#define __DOOMSDAY_UINIT_H__
+
+#include "dd_pinit.h"
+
+void            DD_Shutdown(void);
+
+#endif
diff --git a/doomsday/engine/unix/src/sys_dylib.c b/doomsday/engine/unix/src/sys_dylib.c
@@ -27,7 +27,7 @@
 
 #include "de_base.h"
 #include "m_args.h"
-#include "Unix/sys_dylib.h"
+#include "../include/sys_dylib.h"
 
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/doomsday/engine/unix/src/sys_findfile.c b/doomsday/engine/unix/src/sys_findfile.c
@@ -26,8 +26,8 @@
 #include <glob.h>
 #include <sys/stat.h>
 
-#include "Unix/sys_findfile.h"
-#include "Unix/sys_path.h"
+#include "../include/sys_findfile.h"
+#include "../include/sys_path.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/external/lzss/unix/src/lzss.c b/doomsday/external/lzss/unix/src/lzss.c
@@ -48,8 +48,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
-#include "Unix/sys_findfile.h"
-#include "LZSS.h"
+#include "../../../engine/unix/include/sys_findfile.h"
+#include "lzss.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jheretic/include/jheretic.h b/doomsday/plugins/jheretic/include/jheretic.h
@@ -50,4 +50,6 @@
 #include "../../jheretic/include/tables.h"
 #include "../../jheretic/include/version.h"
 
+#include "p_saveg.h"
+
 #endif // __JHERETIC_CONVENIENCE_H__
diff --git a/doomsday/plugins/jheretic/src/h_refresh.c b/doomsday/plugins/jheretic/src/h_refresh.c
@@ -26,6 +26,7 @@
 #include "jheretic.h"
 #include "f_infine.h"
 #include "r_common.h"
+#include "x_hair.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jheretic/src/p_inter.c b/doomsday/plugins/jheretic/src/p_inter.c
@@ -7,6 +7,8 @@
 #include "jheretic.h"
 #include "d_net.h"
 #include "dmu_lib.h"
+#include "am_map.h"
+#include "p_player.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jheretic/src/p_oldsvg.c b/doomsday/plugins/jheretic/src/p_oldsvg.c
@@ -12,10 +12,12 @@
 
 // TYPES -------------------------------------------------------------------
 
-typedef enum {
+/*
+ typedef enum {
     tc_end,
     tc_mobj
 } thinkerclass_t;
+*/
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 

diff --git a/doomsday/plugins/jheretic/src/p_pspr.c b/doomsday/plugins/jheretic/src/p_pspr.c
@@ -14,6 +14,7 @@
 
 #include "jheretic.h"
 #include "d_net.h"
+#include "p_player.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jheretic/src/p_user.c b/doomsday/plugins/jheretic/src/p_user.c
@@ -10,6 +10,7 @@
 #include "p_view.h"
 #include "r_common.h"
 #include "d_net.h"
+#include "p_player.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jhexen/src/p_inter.c b/doomsday/plugins/jhexen/src/p_inter.c
@@ -11,6 +11,7 @@
 //**************************************************************************
 
 #include "jhexen.h"
+#include "am_map.h"
 
 int     echoMsg = 1;
 

diff --git a/doomsday/plugins/jhexen/src/p_pspr.c b/doomsday/plugins/jhexen/src/p_pspr.c
@@ -45,6 +45,7 @@
 // HEADER FILES ------------------------------------------------------------
 
 #include "jhexen.h"
+#include "p_player.h"
 
 // MACROS ------------------------------------------------------------------
 

diff --git a/doomsday/plugins/jhexen/src/p_user.c b/doomsday/plugins/jhexen/src/p_user.c
@@ -12,7 +12,9 @@
 
 #include <math.h>
 
+
 #include "jhexen.h"
+#include "p_player.h"
 #include "p_view.h"
 
 void    P_PlayerNextArtifact(player_t *player);