yet another fix for wxTextCtrl bg colour (patch 462838)

[wxWidgets.git] / src / stc / makefile.vc

diff --git a/src/stc/makefile.vc b/src/stc/makefile.vc
index 8e91828d3c921bc3b2abc4be5662221192c81c8a..fa0f4a7e77471f6ed7f70d5ee1bd2fe7d436377c 100644 (file)
--- a/src/stc/makefile.vc
+++ b/src/stc/makefile.vc
@@ -15,30 +15,47 @@ NOPCH=1
 !include $(WXDIR)\src\makevc.env
 
 OBJECTS = \
 !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)\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)\LineMarker.obj     \
        $(D)\PropSet.obj        \
        $(D)\Editor.obj         \
        $(D)\Indicator.obj      \
        $(D)\KeyMap.obj         \
        $(D)\KeyWords.obj       \
        $(D)\LineMarker.obj     \
        $(D)\PropSet.obj        \

+       $(D)\RESearch.obj       \

        $(D)\ScintillaBase.obj  \
        $(D)\Style.obj          \
        $(D)\ScintillaBase.obj  \
        $(D)\Style.obj          \

+       $(D)\UniConversion.obj  \

        $(D)\ViewStyle.obj      \
        $(D)\ViewStyle.obj      \

+       $(D)\WindowAccessor.obj \
+                               \
+       $(D)\LexAda.obj         \
+       $(D)\LexAVE.obj         \
+       $(D)\LexConf.obj        \
+       $(D)\LexCPP.obj         \
+       $(D)\LexEiffel.obj      \
+       $(D)\LexHTML.obj        \
+       $(D)\LexLisp.obj        \
+       $(D)\LexLua.obj         \
+       $(D)\LexOthers.obj      \
+       $(D)\LexPascal.obj      \
+       $(D)\LexPerl.obj        \
+       $(D)\LexPython.obj      \
+       $(D)\LexRuby.obj        \
+       $(D)\LexSQL.obj         \
+       $(D)\LexVB.obj          \

                                \
        $(D)\PlatWX.obj         \
        $(D)\ScintillaWX.obj    \
        $(D)\stc.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)
 
 
 all:    $(D) $(LIBTARGET)
 


@@ -67,18 +84,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) @<<
 
 {$(S)}.cxx{$(D)}.obj:
        $(cc) @<<