lassik
/
upscheme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated carbon path and pointer size check

This commit is contained in:
Jon Distad 2013-05-08 19:41:21 -04:00 committed by Lassi Kortela
parent 2950c453c6
commit c222226f43
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.macosx
View File

@ -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 NAME = flisp
SRCS = $(NAME).c builtins.c string.c equalhash.c table.c iostream.c SRCS = $(NAME).c builtins.c string.c equalhash.c table.c iostream.c
@ -9,7 +10,7 @@ LIBTARGET = lib$(NAME)
LLTDIR = llt LLTDIR = llt
LLT = $(LLTDIR)/libllt.a 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) FLAGS = -falign-functions -Wall -Wno-strict-aliasing -I$(LLTDIR) $(CFLAGS) -DUSE_COMPUTED_GOTO $(CONFIG)
LIBFILES = $(LLT) LIBFILES = $(LLT)
LIBS = $(LIBFILES) -lm -framework ApplicationServices LIBS = $(LIBFILES) -lm -framework ApplicationServices

4
llt/dirpath.c
View File

@ -113,8 +113,8 @@ char *get_exename(char *buf, size_t size)
return buf; return buf;
} }
#elif defined(MACOSX) #elif defined(MACOSX)
#include "/Developer/Headers/FlatCarbon/Processes.h" #include <FlatCarbon/Processes.h>
#include "/Developer/Headers/FlatCarbon/Files.h" #include <FlatCarbon/Files.h>
char *get_exename(char *buf, size_t size) char *get_exename(char *buf, size_t size)
{ {
ProcessSerialNumber PSN; ProcessSerialNumber PSN;

2
llt/dtypes.h
View File

@ -28,6 +28,7 @@
#endif #endif
#if !defined (BITS32) && !defined (BITS64)
#ifndef __SIZEOF_POINTER__ #ifndef __SIZEOF_POINTER__
# error "__SIZEOF_POINTER__ undefined" # error "__SIZEOF_POINTER__ undefined"
#endif #endif
@ -38,6 +39,7 @@
#else #else
# error "this is one weird machine" # error "this is one weird machine"
#endif #endif
#endif
#if defined(WIN32) #if defined(WIN32)