X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce192d417eb9eb614bcf8510e91dac318706249..53e46b61bbe4ce72b92c8898907f0a879d5f012b:/src/stc/makefile.vc diff --git a/src/stc/makefile.vc b/src/stc/makefile.vc index 8e91828d3c..b8fce0a183 100644 --- a/src/stc/makefile.vc +++ b/src/stc/makefile.vc @@ -15,30 +15,39 @@ NOPCH=1 !include $(WXDIR)\src\makevc.env OBJECTS = \ - $(D)\Accessor.obj \ $(D)\AutoComplete.obj \ $(D)\CallTip.obj \ $(D)\CellBuffer.obj \ $(D)\ContractionState.obj\ $(D)\Document.obj \ + $(D)\DocumentAccessor.obj\ $(D)\Editor.obj \ $(D)\Indicator.obj \ $(D)\KeyMap.obj \ $(D)\KeyWords.obj \ + $(D)\LexCPP.obj \ + $(D)\LexHTML.obj \ + $(D)\LexLua.obj \ + $(D)\LexOthers.obj \ + $(D)\LexPerl.obj \ + $(D)\LexPython.obj \ + $(D)\LexSQL.obj \ + $(D)\LexVB.obj \ $(D)\LineMarker.obj \ + $(D)\PosRegExp.obj \ $(D)\PropSet.obj \ $(D)\ScintillaBase.obj \ $(D)\Style.obj \ + $(D)\UniConversion.obj \ $(D)\ViewStyle.obj \ + $(D)\WindowAccessor.obj \ \ $(D)\PlatWX.obj \ $(D)\ScintillaWX.obj \ $(D)\stc.obj \ - - -LIBTARGET = $(WXDIR)\contrib\lib\stc$(LIBEXT).lib +LIBTARGET = $(WXDIR)\lib\stc$(LIBEXT).lib all: $(D) $(LIBTARGET) @@ -67,18 +76,6 @@ $(OBJECTS) << -$(PROGRAM).exe: $(D)\$(PROGRAM).obj $(DUMMYOBJ) $(WXLIB) $(LIBTARGET) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(D)\$(PROGRAM).obj $(LIBTARGET) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - {$(S)}.cxx{$(D)}.obj: $(cc) @<<