Updated carbon path and pointer size check
This commit is contained in:
		
							parent
							
								
									2950c453c6
								
							
						
					
					
						commit
						c222226f43
					
				| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
CC = gcc
 | 
			
		||||
CC ?= gcc
 | 
			
		||||
CARBON_HEADERS ?= "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/Developer/Headers"
 | 
			
		||||
 | 
			
		||||
NAME = flisp
 | 
			
		||||
SRCS = $(NAME).c builtins.c string.c equalhash.c table.c iostream.c
 | 
			
		||||
| 
						 | 
				
			
			@ -9,7 +10,7 @@ LIBTARGET = lib$(NAME)
 | 
			
		|||
LLTDIR = llt
 | 
			
		||||
LLT = $(LLTDIR)/libllt.a
 | 
			
		||||
 | 
			
		||||
CONFIG = -DMACOSX -DARCH_X86_64 -DBITS64 -D__CPU__=686
 | 
			
		||||
CONFIG = -DMACOSX -DARCH_X86_64 -DBITS64 -D__CPU__=686 -I$(CARBON_HEADERS)
 | 
			
		||||
FLAGS = -falign-functions -Wall -Wno-strict-aliasing -I$(LLTDIR) $(CFLAGS) -DUSE_COMPUTED_GOTO $(CONFIG)
 | 
			
		||||
LIBFILES = $(LLT)
 | 
			
		||||
LIBS = $(LIBFILES) -lm -framework ApplicationServices
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -113,8 +113,8 @@ char *get_exename(char *buf, size_t size)
 | 
			
		|||
    return buf;
 | 
			
		||||
}
 | 
			
		||||
#elif defined(MACOSX)
 | 
			
		||||
#include "/Developer/Headers/FlatCarbon/Processes.h"
 | 
			
		||||
#include "/Developer/Headers/FlatCarbon/Files.h"
 | 
			
		||||
#include <FlatCarbon/Processes.h>
 | 
			
		||||
#include <FlatCarbon/Files.h>
 | 
			
		||||
char *get_exename(char *buf, size_t size)
 | 
			
		||||
{
 | 
			
		||||
    ProcessSerialNumber PSN;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,6 +28,7 @@
 | 
			
		|||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if !defined (BITS32) && !defined (BITS64)
 | 
			
		||||
#ifndef __SIZEOF_POINTER__
 | 
			
		||||
#  error "__SIZEOF_POINTER__ undefined"
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +39,7 @@
 | 
			
		|||
#else
 | 
			
		||||
#  error "this is one weird machine"
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#if defined(WIN32)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue