diff --git a/makefile b/makefile index 7ca60168..a14a9a8a 100644 --- a/makefile +++ b/makefile @@ -265,11 +265,11 @@ clean: # rm_objects := rm $(wildcard *.o) # objects rm *.o - rm *.so rm *.h rm *.c - rm *.a rm *.sym + rm *.a + rm *.so install: test -d $(PREFIX)/bin | mkdir -p $(PREFIX)/bin diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64 index b02f55e8..dc95daf6 100644 --- a/makefile.darwin.clang.x86_64 +++ b/makefile.darwin.clang.x86_64 @@ -8,8 +8,10 @@ RELEASE = 1.0 INCLUDEPATH = -Isrc/lib/system/$(TOS)/$(CCOMP)/$(TARCH) +#ADDITIONALFLAGS = "-Wno-implicit-function-declaration -Wno-pointer-sign -Wno-implicit-int -Wno-logical-op-parentheses" +ADDITIONALFLAGS = "" -SETPATH = CFLAGS=$(INCLUDEPATH) PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test +SETPATH = CFLAGS="$(ADDITIONALFLAGS) $(INCLUDEPATH)" PATH=.:/bin:/usr/bin MODULES=.:src/lib:src/lib/v4:src/lib/v4/$(TARCH):src/lib/system/$(TOS)/$(CCOMP):src/lib/system/$(TOS)/$(CCOMP)/$(TARCH):src/lib/ulm:src/lib/ulm/$(TARCH):src/lib/ooc2:src/lib/ooc2/$(TOS)/$(CCOMP):src/lib/ooc:src/lib/ooc/$(TOS)/$(CCOMP)/$(TARCH):src/lib/pow:src/lib/misc:src/lib/s3:src/voc:src/voc/$(TOS)/$(CCOMP):src/voc/$(TOS)/$(CCOMP)/$(TARCH):src/tools/ocat:src/tools/browser:src/tools/vocparam:src/tools/vmake:src/tools/coco:src/test VOC = voc VERSION = $(TOS).$(CCOMP).$(TARCH) @@ -27,7 +29,7 @@ ifndef PREFIXLN PREFIXLN = /opt/voc endif -CCOPT = -fPIC $(INCLUDEPATH) -g +CCOPT = -fPIC $(ADDITIONALFLAGS) $(INCLUDEPATH) -g CC = cc $(CCOPT) -c CL = cc $(CCOPT) @@ -98,16 +100,16 @@ stage5: $(CC) SYSTEM.c Args.c Console.c Modules.c Unix.c \ oocOakStrings.c architecture.c version.c Kernel.c Files.c OakFiles.c Reals.c CmdlnTexts.c \ version.c extTools.c \ - OPM.c OPS.c OPT.c OPC.c OPV.c OPB.c OPP.c errors.c + OPM.c OPS.c OPT.c OPC.c OPV.c OPB.c OPP.c errors.c - $(CL) -static voc.c -o voc \ + $(CL) voc.c -o voc \ SYSTEM.o Args.o Console.o Modules.o Unix.o \ oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \ extTools.o \ OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o $(CL) BrowserCmd.c -o showdef \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \ - OPM.o OPS.o OPT.o OPV.o OPC.o errors.o + OPM.o OPS.o OPT.o OPV.o OPC.o errors.o $(CL) OCatCmd.c -o ocat \ SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o @@ -256,10 +258,10 @@ stage6: stage7: #objects := $(wildcard *.o) #$(LD) objects - $(ARCHIVE) *.o + ###$(ARCHIVE) *.o #$(ARCHIVE) objects - $(LD) *.o - echo "$(PREFIX)/lib" > 05vishap.conf + ###$(LD) *.o +### echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/ocat b/ocat index c5e15fe4..67b7f6fd 100755 Binary files a/ocat and b/ocat differ diff --git a/showdef b/showdef index 8baf9d05..e68a3583 100755 Binary files a/showdef and b/showdef differ diff --git a/voc b/voc index 09acf3b2..50baf847 100755 Binary files a/voc and b/voc differ diff --git a/vocparam b/vocparam index 33ba444a..86be4cf1 100755 Binary files a/vocparam and b/vocparam differ diff --git a/vocstatic b/vocstatic index 09acf3b2..99591bf8 100755 Binary files a/vocstatic and b/vocstatic differ diff --git a/vocstatic.darwin.clang.x86_64 b/vocstatic.darwin.clang.x86_64 new file mode 100755 index 00000000..6d30dd50 Binary files /dev/null and b/vocstatic.darwin.clang.x86_64 differ