diff options
| author | mixedpuppy <unknown> | 2007-12-05 23:06:58 +0000 |
|---|---|---|
| committer | mixedpuppy <unknown> | 2007-12-05 23:06:58 +0000 |
| commit | 21f54a4c47ad89ab870be19b4db5ca1914992608 (patch) | |
| tree | 7a56a2c74170e09c85b98ecdeebce310d001ad7d /macosx/makefile | |
| parent | edac7fdf643fc5f1a374508f4f993de0951ff324 (diff) | |
| download | scintilla-mirror-21f54a4c47ad89ab870be19b4db5ca1914992608.tar.gz | |
modified version of adobe OSX patches. Most of these patches are provided by Adobe, though I've
reorganized a lot of them
- improved drag/drop
- make copy/paste use modern pasteboard api's
- optimized textlayout usage
- reduce assertions for debug builds
- implement IME support
- other minor things
patches are available in openkomodo, which is a good test ground for scintilla osx (until someone
ports SCiTE).
Diffstat (limited to 'macosx/makefile')
| -rw-r--r-- | macosx/makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/macosx/makefile b/macosx/makefile index 02ff7998a..73342ce3e 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -50,10 +50,15 @@ ifdef CONTAINER_HANDLES_EVENTS CONTAINER=-DCONTAINER_HANDLES_EVENTS=1 endif +ifdef EXT_INPUT +EXT_INPUT=-DEXT_INPUT +EXTOBS=ExtInput.o +endif + .cxx.o: - $(CC) $(CXXFLAGS) $(OPTIONS) $(DFLAGS) $(CONTAINER) $(ARCHFLAGS) $(INCLUDEDIRS) -c $< + $(CC) $(CXXFLAGS) $(OPTIONS) $(DFLAGS) $(CONTAINER) $(ARCHFLAGS) $(EXT_INPUT) $(INCLUDEDIRS) -c $< .c.o: - $(CCOMP) $(CXXFLAGS) $(OPTIONS) $(DFLAGS) $(CONTAINER) $(ARCHFLAGS) $(INCLUDEDIRS) -w -c $< + $(CCOMP) $(CXXFLAGS) $(OPTIONS) $(DFLAGS) $(CONTAINER) $(ARCHFLAGS) $(EXT_INPUT) $(INCLUDEDIRS) -w -c $< #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) @@ -87,13 +92,13 @@ COMPLIB=DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatMacOSX.o \ KeyMap.o LineMarker.o ScintillaMacOSX.o CellBuffer.o ViewStyle.o \ RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ - TCarbonEvent.o TView.o ScintillaCallTip.o \ + TCarbonEvent.o TView.o ScintillaCallTip.o $(EXTOBS) \ $(LEXOBJS) -$(STATICLIB): $(COMPLIB) +$(STATICLIB): $(COMPLIB) $(LIBTOOL) -static -o $@ $^ -$(DYNAMICLIB): $(COMPLIB) +$(DYNAMICLIB): $(COMPLIB) $(CC) -dynamic -o $@ $(DYN_FLAGS) $^ # Generate header files from Scintilla.iface |