diff options
| author | nyamatongwe <unknown> | 2010-07-13 21:28:02 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2010-07-13 21:28:02 +1000 |
| commit | 9f6099816f5f0553bbbc235cc250cb63c334a4fa (patch) | |
| tree | 710896a04b18e8fc0fbf871c6a589a1da9d9d29a /cocoa/SciTest.mk | |
| parent | a2bcf02b59cbb8f689259b1d379f146f0fd8b013 (diff) | |
| download | scintilla-mirror-9f6099816f5f0553bbbc235cc250cb63c334a4fa.tar.gz | |
Build files that reflect the new lexer directories and added files.
Diffstat (limited to 'cocoa/SciTest.mk')
| -rw-r--r-- | cocoa/SciTest.mk | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/cocoa/SciTest.mk b/cocoa/SciTest.mk index cd922e1b5..1cd075307 100644 --- a/cocoa/SciTest.mk +++ b/cocoa/SciTest.mk @@ -1,25 +1,14 @@ ### start defines ### -NAME=Editor +include common.mk -ARCH=-arch i386 -CC=gcc -x c++ $(ARCH) -CO=gcc -x objective-c++ $(ARCH) -LD=gcc $(ARCH) -framework Cocoa - -gDEFs=-DSCI_NAMESPACE -DSCI_LEXER +NAME=Demo -INCS=-I../src/ -I../include/ -I. -CCX=$(CC) $(gDEFs) $(INCS) -CCO=$(CO) $(gDEFs) $(INCS) +LD=gcc $(ARCH) -framework Cocoa -BLD=build/SciAppBuild TARG=$(APP)/Contents/MacOS/$(NAME) -APP=$(BLD)/$(NAME).app - -all: $(BLD) $(TARG) +APP=$(APP_BLD)/$(NAME).app -clean: - -rm -rf $(BLD) +all: $(APP_BLD) $(TARG) $(APP): -rm -rf $(APP) @@ -38,17 +27,10 @@ $(APP): -cp ScintillaTest/TestData.sql $(APP)/Contents/Resources/ -make -f Framework.mk all -$(TARG) : $(BLD)/main.o $(BLD)/AppController.o $(APP) - -cp -R build/framebuild/Sci.framework $(APP)/Contents/Frameworks/ - $(LD) $(BLD)/main.o $(BLD)/AppController.o $(APP)/Contents/Frameworks/Sci.framework/Sci -o $(TARG) -lstdc++ +$(TARG) : $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP) + -cp -R $(FRM_BLD)/Sci.framework $(APP)/Contents/Frameworks/ + $(LD) $(APP_BLD)/main.o $(APP_BLD)/AppController.o $(APP)/Contents/Frameworks/Sci.framework/Sci -o $(TARG) -lstdc++ - -$(BLD) : - -mkdir build +$(APP_BLD) : -mkdir $(BLD) - -$(BLD)/%.o : ScintillaTest/%.mm - $(CCO) -c $< -o $@ - -$(BLD)/%.o : ScintillaTest/%.m - $(CCO) -c $< -o $@ + -mkdir $(APP_BLD) |