comparison src/s/darwin.h @ 46776:16b6134d7193

In src: 2002-07-31 Andrew Choi <akochoi@shaw.ca> * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if HAVE_CARBON is defined. In mac: 2002-07-31 Andrew Choi <akochoi@shaw.ca> * INSTALL: Add instructions for building X Window version.
author Andrew Choi <akochoi@shaw.ca>
date Thu, 01 Aug 2002 03:33:20 +0000
parents 474a28fb856c
children eba75fedd593
comparison
equal deleted inserted replaced
46775:fa09ee24694e 46776:16b6134d7193
38 /* #define VMS */ 38 /* #define VMS */
39 39
40 /* MAC_OS is used to conditionally compile code common to both MAC_OS8 40 /* MAC_OS is used to conditionally compile code common to both MAC_OS8
41 and MAC_OSX. */ 41 and MAC_OSX. */
42 #ifdef MAC_OSX 42 #ifdef MAC_OSX
43 #ifdef HAVE_CARBON
43 #define MAC_OS 44 #define MAC_OS
45 #endif
44 #endif 46 #endif
45 47
46 /* SYSTEM_TYPE should indicate the kind of system you are using. 48 /* SYSTEM_TYPE should indicate the kind of system you are using.
47 It sets the Lisp variable system-type. */ 49 It sets the Lisp variable system-type. */
48 50
220 222
221 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ 223 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
222 #define HAVE_SOCKETS 224 #define HAVE_SOCKETS
223 225
224 /* Extra initialization calls in main for Mac OS X system type. */ 226 /* Extra initialization calls in main for Mac OS X system type. */
227 #ifdef HAVE_CARBON
225 #define SYMS_SYSTEM syms_of_mac() 228 #define SYMS_SYSTEM syms_of_mac()
229 #endif
226 230
227 /* Definitions for how to dump. Copied from nextstep.h. */ 231 /* Definitions for how to dump. Copied from nextstep.h. */
228 232
229 #define UNEXEC unexmacosx.o 233 #define UNEXEC unexmacosx.o
230 234
269 /* Adding -lm confuses the dynamic linker, so omit it. */ 273 /* Adding -lm confuses the dynamic linker, so omit it. */
270 #define LIB_MATH 274 #define LIB_MATH
271 275
272 /* Tell src/Makefile.in to create files in the Mac OS X application 276 /* Tell src/Makefile.in to create files in the Mac OS X application
273 bundle mac/Emacs.app. */ 277 bundle mac/Emacs.app. */
278 #ifdef HAVE_CARBON
274 #define OTHER_FILES macosx-app 279 #define OTHER_FILES macosx-app
280 #endif
275 281
276 282
277 /* Define the following so emacs symbols will not conflict with those 283 /* Define the following so emacs symbols will not conflict with those
278 in the System framework. Otherwise -prebind will not work. */ 284 in the System framework. Otherwise -prebind will not work. */
279 285