Link to PhysicsFS static library and use header from source for Mac OS X
This commit is contained in:
kreatordxx
parent
0a44a68fed
commit
35a69d5a0f
|
|
@ -4,6 +4,7 @@ D1X-Rebirth Changelog
|
|||
--------
|
||||
arch/carbon/conf.h: Enable IPv6 for Mac OS X
|
||||
main/config.c: Set default Jukebox music paths to original Redbook music in iTunes for Mac OS X
|
||||
d1x-rebirth.xcodeproj/project.pbxproj, include/cfile.h, include/hmp.h, include/physfsx.h, INSTALL.txt, main/config.c, main/inferno.c, main/newdemo.c, main/newmenu.c, main/playsave.c, misc/hmp.c, misc/ignorecase.c: Link to PhysicsFS static library and use header from source for Mac OS X
|
||||
|
||||
20100904
|
||||
--------
|
||||
|
|
|
|||
29
INSTALL.txt
29
INSTALL.txt
|
|
@ -31,11 +31,22 @@ Compiling:
|
|||
MacOS:
|
||||
------
|
||||
For Mac OS X, an Xcode project is available (requires Xcode 2.1 or later). Xcode includes the compiler
|
||||
and OpenGL. For Mac OS 9, an MPW Makefile is available. MPW includes the compiler. For the sources to
|
||||
compile, they will need to be made into text files using a typecode changing program, if they were
|
||||
downloaded outside of Mac OS 9 (including Mac OS X). This will also need to be done after any Terminal
|
||||
command (diff, svn update etc) edits the source files.
|
||||
SCons also works on MacOS, but it's recommended to use XCode instead.
|
||||
and OpenGL. The standard SDL and SDL_mixer libraries from the SDL website may be used, these go in
|
||||
/Library/Frameworks or ~/Library/Frameworks. However, to fix MP3 support for the 'Release' build I used
|
||||
SDL 1.2.8 with Diedel's modified SMPEG library from his D2X-XL website. To debug these libraries compile
|
||||
the frameworks from source as 'Debug' builds, then use these instead. PhysicsFS must be compiled from
|
||||
source. Put its enclosing folder 'physfs', renaming if necessary, next to D1X's (typically d1x-rebirth).
|
||||
In CMake ensure the build path points to 'build' inside 'physfs'. Specify 'i386;ppc' as the architecture
|
||||
for a universal binary. In Xcode, build the 'Debug' static library target. If anyone knows how to get the
|
||||
'Release' build to properly link with DXX, please tell.
|
||||
SCons also works on MacOS X, but it's recommended to use XCode instead.
|
||||
|
||||
For Mac OS 9, an MPW Makefile is available. MPW includes the compiler. As for the shared libraries,
|
||||
compile PhysicsFS version 1.0 and the latest SDL and SDL_mixer (as of writing) from source.
|
||||
For any sources to compile, they will need to be made into text files using a typecode changing program,
|
||||
if they were downloaded outside of Mac OS 9 (including Mac OS X). This will also need to be done after any
|
||||
Terminal command (diff, svn update etc) edits the source files.
|
||||
|
||||
Note that there are ready-to-go packages on http://www.dxx-rebirth.com
|
||||
|
||||
Win32:
|
||||
|
|
@ -58,8 +69,14 @@ Needed files:
|
|||
descent.hog
|
||||
descent.pig
|
||||
|
||||
For the PC CD-ROM, these files should be located on the Descent1 CD-Rom. The PC version data files need
|
||||
to be patched to version 1.4a.
|
||||
|
||||
There is a patch available at:
|
||||
http://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip
|
||||
|
||||
For the Mac CD-ROM, the data files will need to be installed from the CD using a Mac system earler than
|
||||
OS X. Classic will work. If you know of any other way, please tell me at chris at icculus.org.
|
||||
OS X. Classic will work. StuffIt tech support said this is virtually the only way.
|
||||
|
||||
Note that the above files must be lowercase if you use an operating system with case-sensitive file management.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
179E6E9E11F37B3400175C54 /* hmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 179E6E9D11F37B3400175C54 /* hmp.c */; };
|
||||
179E6E9F11F37B3400175C54 /* hmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 179E6E9D11F37B3400175C54 /* hmp.c */; };
|
||||
17A707EB10C1B5FA002D1680 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB92BEC40CDD6B4B0045A32C /* SDL_mixer.framework */; };
|
||||
17A707EC10C1B604002D1680 /* physfs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAFC20E088E3F2A006329AD /* physfs.framework */; };
|
||||
17DFA6B110C1A29500674D11 /* net_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 17DFA6AF10C1A29500674D11 /* net_udp.c */; };
|
||||
6710AAFF066B2D6100DB0F68 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6710AAFE066B2D6100DB0F68 /* SDL.framework */; };
|
||||
6710AB00066B2D6100DB0F68 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6710AAFE066B2D6100DB0F68 /* SDL.framework */; };
|
||||
|
|
@ -270,7 +269,6 @@
|
|||
67F6FED3066B13B400443922 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 67F6FED1066B13B400443922 /* SDLMain.m */; };
|
||||
67F6FED4066B13B400443922 /* SDLMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 67F6FED0066B13B400443922 /* SDLMain.h */; };
|
||||
67F6FED5066B13B400443922 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 67F6FED1066B13B400443922 /* SDLMain.m */; };
|
||||
EB0E38C111169C1700791182 /* net_ipx.c in Sources */ = {isa = PBXBuildFile; fileRef = EBF658990F936A8400CB5C73 /* net_ipx.c */; };
|
||||
EB1405BA12100883002B1CC6 /* physfsx.c in Sources */ = {isa = PBXBuildFile; fileRef = EB1405B912100883002B1CC6 /* physfsx.c */; };
|
||||
EB1405BB12100883002B1CC6 /* physfsx.c in Sources */ = {isa = PBXBuildFile; fileRef = EB1405B912100883002B1CC6 /* physfsx.c */; };
|
||||
EB28D99C0ECEABD700E68E9B /* init.c in Sources */ = {isa = PBXBuildFile; fileRef = EB28D99B0ECEABD700E68E9B /* init.c */; };
|
||||
|
|
@ -286,6 +284,8 @@
|
|||
EB380D7D0E168B1900EBD9AD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EB380D7B0E168B1900EBD9AD /* InfoPlist.strings */; };
|
||||
EB380D7E0E168B1900EBD9AD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EB380D7B0E168B1900EBD9AD /* InfoPlist.strings */; };
|
||||
EB775A7A105611720036C348 /* extractD1Data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB775A79105611720036C348 /* extractD1Data.cpp */; };
|
||||
EB796886123F1C8F00B2028B /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB796885123F1C8F00B2028B /* libphysfs.a */; };
|
||||
EB796887123F1C8F00B2028B /* libphysfs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB796885123F1C8F00B2028B /* libphysfs.a */; };
|
||||
EB861343111E9E810097D871 /* net_ipx.c in Sources */ = {isa = PBXBuildFile; fileRef = EBF658990F936A8400CB5C73 /* net_ipx.c */; };
|
||||
EB8BE84F1071FBE00069486E /* player.c in Sources */ = {isa = PBXBuildFile; fileRef = EB8BE84E1071FBE00069486E /* player.c */; };
|
||||
EB8BE8501071FBE00069486E /* player.c in Sources */ = {isa = PBXBuildFile; fileRef = EB8BE84E1071FBE00069486E /* player.c */; };
|
||||
|
|
@ -304,7 +304,6 @@
|
|||
EBAC98FB0D42497F0017D4BC /* ignorecase.c in Sources */ = {isa = PBXBuildFile; fileRef = EBAC98F90D42497F0017D4BC /* ignorecase.c */; };
|
||||
EBAC98FD0D42497F0017D4BC /* ignorecase.c in Sources */ = {isa = PBXBuildFile; fileRef = EBAC98F90D42497F0017D4BC /* ignorecase.c */; };
|
||||
EBAEB74C0BF4A86F00FC6E13 /* d1x-rebirth.icns in Resources */ = {isa = PBXBuildFile; fileRef = EBAEB74B0BF4A86F00FC6E13 /* d1x-rebirth.icns */; };
|
||||
EBAFC20F088E3F2A006329AD /* physfs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAFC20E088E3F2A006329AD /* physfs.framework */; };
|
||||
EBAFC26E088E508D006329AD /* conf.h in Headers */ = {isa = PBXBuildFile; fileRef = EBAFC269088E508D006329AD /* conf.h */; };
|
||||
EBAFC290088E67CD006329AD /* digiobj.c in Sources */ = {isa = PBXBuildFile; fileRef = EBAFC28F088E67CD006329AD /* digiobj.c */; };
|
||||
EBAFC291088E67CD006329AD /* digiobj.c in Sources */ = {isa = PBXBuildFile; fileRef = EBAFC28F088E67CD006329AD /* digiobj.c */; };
|
||||
|
|
@ -579,6 +578,7 @@
|
|||
EB3CA4F90E97740E00FB1E93 /* tracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tracker.h; sourceTree = "<group>"; };
|
||||
EB775A6F105611320036C348 /* d1Extract */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = d1Extract; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
EB775A79105611720036C348 /* extractD1Data.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extractD1Data.cpp; sourceTree = "<group>"; };
|
||||
EB796885123F1C8F00B2028B /* libphysfs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libphysfs.a; path = ../physfs/build/Debug/libphysfs.a; sourceTree = SOURCE_ROOT; };
|
||||
EB8BE84E1071FBE00069486E /* player.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = player.c; sourceTree = "<group>"; };
|
||||
EB9181090DABA47B0010CB39 /* console.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = "<group>"; };
|
||||
EB92BE5C0CDD693C0045A32C /* digi_audio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = digi_audio.c; sourceTree = "<group>"; };
|
||||
|
|
@ -592,7 +592,6 @@
|
|||
EBAC994E0D4250320017D4BC /* ignorecase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ignorecase.h; sourceTree = "<group>"; };
|
||||
EBAC99500D4250320017D4BC /* physfsx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = physfsx.h; sourceTree = "<group>"; };
|
||||
EBAEB74B0BF4A86F00FC6E13 /* d1x-rebirth.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "d1x-rebirth.icns"; path = "arch/cocoa/d1x-rebirth.icns"; sourceTree = "<group>"; };
|
||||
EBAFC20E088E3F2A006329AD /* physfs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = physfs.framework; path = /Library/Frameworks/physfs.framework; sourceTree = "<absolute>"; };
|
||||
EBAFC269088E508D006329AD /* conf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = "<group>"; };
|
||||
EBAFC26A088E508D006329AD /* descent.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = descent.r; sourceTree = "<group>"; };
|
||||
EBAFC26D088E508D006329AD /* SDL_main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SDL_main.c; sourceTree = "<group>"; };
|
||||
|
|
@ -731,9 +730,9 @@
|
|||
files = (
|
||||
676AC26C0668A938007173EB /* Cocoa.framework in Frameworks */,
|
||||
6710AB00066B2D6100DB0F68 /* SDL.framework in Frameworks */,
|
||||
EBAFC20F088E3F2A006329AD /* physfs.framework in Frameworks */,
|
||||
EB92BEC60CDD6B4B0045A32C /* SDL_mixer.framework in Frameworks */,
|
||||
EBC858F5122E165800FA437D /* ApplicationServices.framework in Frameworks */,
|
||||
EB796887123F1C8F00B2028B /* libphysfs.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -745,8 +744,8 @@
|
|||
6710AAFF066B2D6100DB0F68 /* SDL.framework in Frameworks */,
|
||||
6710AB69066B2E0400DB0F68 /* OpenGL.framework in Frameworks */,
|
||||
17A707EB10C1B5FA002D1680 /* SDL_mixer.framework in Frameworks */,
|
||||
17A707EC10C1B604002D1680 /* physfs.framework in Frameworks */,
|
||||
EBC858F4122E165800FA437D /* ApplicationServices.framework in Frameworks */,
|
||||
EB796886123F1C8F00B2028B /* libphysfs.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -772,9 +771,9 @@
|
|||
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
EB796885123F1C8F00B2028B /* libphysfs.a */,
|
||||
EBC858F3122E165800FA437D /* ApplicationServices.framework */,
|
||||
EB92BEC40CDD6B4B0045A32C /* SDL_mixer.framework */,
|
||||
EBAFC20E088E3F2A006329AD /* physfs.framework */,
|
||||
6710AB68066B2E0400DB0F68 /* OpenGL.framework */,
|
||||
6710AAFE066B2D6100DB0F68 /* SDL.framework */,
|
||||
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
|
||||
|
|
@ -1863,7 +1862,6 @@
|
|||
EBE8D8900FDA76D1009D181F /* gamerend.c in Sources */,
|
||||
EB8BE84F1071FBE00069486E /* player.c in Sources */,
|
||||
EB2EEB6910C5F8A3005256F2 /* net_udp.c in Sources */,
|
||||
EB0E38C111169C1700791182 /* net_ipx.c in Sources */,
|
||||
179E6E9F11F37B3400175C54 /* hmp.c in Sources */,
|
||||
EB1405BA12100883002B1CC6 /* physfsx.c in Sources */,
|
||||
);
|
||||
|
|
@ -1941,7 +1939,6 @@
|
|||
/Library/Frameworks,
|
||||
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
|
||||
);
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
|
|
@ -1953,10 +1950,12 @@
|
|||
include,
|
||||
main,
|
||||
arch/sdl/include,
|
||||
../physfs,
|
||||
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
|
||||
/Library/Frameworks/SDL.framework/Headers,
|
||||
);
|
||||
INFOPLIST_FILE = "d1x-Info.plist";
|
||||
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
PRODUCT_NAME = d1x;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
ZERO_LINK = NO;
|
||||
|
|
@ -1972,7 +1971,6 @@
|
|||
/Library/Frameworks,
|
||||
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
);
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
|
|
@ -1985,10 +1983,12 @@
|
|||
include,
|
||||
main,
|
||||
arch/sdl/include,
|
||||
../physfs,
|
||||
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
|
||||
/Library/Frameworks/SDL.framework/Headers,
|
||||
);
|
||||
INFOPLIST_FILE = "d1x-Info.plist";
|
||||
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
PRODUCT_NAME = d1x;
|
||||
SKIP_INSTALL = NO;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
|
|
@ -2014,6 +2014,8 @@
|
|||
);
|
||||
INFOPLIST_FILE = "d1x-Info.plist";
|
||||
INSTALL_PATH = "$(USER_APPS_DIR)";
|
||||
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../Library/Frameworks\"";
|
||||
PRODUCT_NAME = d1x;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
};
|
||||
|
|
@ -2028,7 +2030,6 @@
|
|||
/Library/Frameworks,
|
||||
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
|
||||
);
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
|
|
@ -2044,10 +2045,12 @@
|
|||
main,
|
||||
arch/sdl/include,
|
||||
arch/ogl/include,
|
||||
../physfs,
|
||||
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
|
||||
/Library/Frameworks/SDL.framework/Headers,
|
||||
);
|
||||
INFOPLIST_FILE = "d1xgl-Info.plist";
|
||||
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
PRODUCT_NAME = d1xgl;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
ZERO_LINK = NO;
|
||||
|
|
@ -2063,7 +2066,6 @@
|
|||
/Library/Frameworks,
|
||||
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
);
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks\"";
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = NO;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
|
|
@ -2078,10 +2080,12 @@
|
|||
main,
|
||||
arch/sdl/include,
|
||||
arch/ogl/include,
|
||||
../physfs,
|
||||
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
|
||||
/Library/Frameworks/SDL.framework/Headers,
|
||||
);
|
||||
INFOPLIST_FILE = "d1xgl-Info.plist";
|
||||
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
PRODUCT_NAME = d1xgl;
|
||||
SKIP_INSTALL = NO;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
|
|
@ -2109,6 +2113,15 @@
|
|||
);
|
||||
INFOPLIST_FILE = "d1xgl-Info.plist";
|
||||
INSTALL_PATH = "$(USER_APPS_DIR)";
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
|
||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../Library/Frameworks\"";
|
||||
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../physfs/build/Debug\"";
|
||||
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../physfs/build/Release\"";
|
||||
PRODUCT_NAME = d1xgl;
|
||||
WARNING_CFLAGS = "-Wall";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "pstypes.h"
|
||||
#include "maths.h"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
#ifndef __HMP_H
|
||||
#define __HMP_H
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@
|
|||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
// When PhysicsFS can *easily* be built as a framework on Mac OS X,
|
||||
// the framework form will be supported again -kreatordxx
|
||||
#if 1 //!(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
|
|
|
|||
|
|
@ -22,11 +22,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
#include "pstypes.h"
|
||||
#include "game.h"
|
||||
|
|
|
|||
|
|
@ -36,12 +36,6 @@ char copyright[] = "DESCENT COPYRIGHT (C) 1994,1995 PARALLAX SOFTWARE CORPORAT
|
|||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "pstypes.h"
|
||||
#include "strutil.h"
|
||||
#include "console.h"
|
||||
|
|
@ -315,6 +309,9 @@ int main(int argc, char *argv[])
|
|||
"\tDirectory containing D1X\n"
|
||||
#endif
|
||||
"\tIn a subdirectory called 'Data'\n"
|
||||
#if (defined(__APPLE__) && defined(__MACH__)) || defined(macintosh)
|
||||
"\tIn 'Resources' inside the application bundle\n"
|
||||
#endif
|
||||
"Or use the -hogdir option to specify an alternate location.");
|
||||
|
||||
switch (cfile_size("descent.hog"))
|
||||
|
|
|
|||
|
|
@ -25,12 +25,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "u_mem.h"
|
||||
#include "inferno.h"
|
||||
#include "game.h"
|
||||
|
|
|
|||
|
|
@ -22,11 +22,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "pstypes.h"
|
||||
#include "error.h"
|
||||
|
|
|
|||
|
|
@ -21,11 +21,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "error.h"
|
||||
#include "gameseq.h"
|
||||
#include "player.h"
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
#endif
|
||||
|
||||
#include "hmp.h"
|
||||
#include "u_mem.h"
|
||||
#include "cfile.h"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#if !(defined(__APPLE__) && defined(__MACH__))
|
||||
#if 1 //!(defined(__APPLE__) && defined(__MACH__))
|
||||
#include <physfs.h>
|
||||
#else
|
||||
#include <physfs/physfs.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue