compilation fixes

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

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index d3c3a21c1c58a6e7f0d02375b8d37c7d06d5de68..cf4abc21dba06e4cfe7eaff1910008ef93f0b315 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -26,16 +26,16 @@ EXTRASTCCPPFLAGS = -D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$
 
 
 OBJECTS = \
 
 
 OBJECTS = \

-        $(OBJ_PATH)\AutoComplete.obj           \
-        $(OBJ_PATH)\CallTip.obj                        \
-        $(OBJ_PATH)\CellBuffer.obj             \
-        $(OBJ_PATH)\ContractionState.obj       \
-        $(OBJ_PATH)\Document.obj               \
+    $(OBJ_PATH)\AutoComplete.obj               \
+    $(OBJ_PATH)\CallTip.obj                    \
+    $(OBJ_PATH)\CellBuffer.obj         \
+    $(OBJ_PATH)\ContractionState.obj   \
+    $(OBJ_PATH)\Document.obj           \

        $(OBJ_PATH)\DocumentAccessor.obj        \
        $(OBJ_PATH)\DocumentAccessor.obj        \

-        $(OBJ_PATH)\Editor.obj                 \
-        $(OBJ_PATH)\Indicator.obj              \
-        $(OBJ_PATH)\KeyMap.obj                 \
-        $(OBJ_PATH)\KeyWords.obj               \
+    $(OBJ_PATH)\Editor.obj                     \
+    $(OBJ_PATH)\Indicator.obj       \
+    $(OBJ_PATH)\KeyMap.obj                     \
+    $(OBJ_PATH)\KeyWords.obj       \

        $(OBJ_PATH)\LexAVE.obj                  \
        $(OBJ_PATH)\LexAda.obj                  \
        $(OBJ_PATH)\LexAsm.obj                  \
        $(OBJ_PATH)\LexAVE.obj                  \
        $(OBJ_PATH)\LexAda.obj                  \
        $(OBJ_PATH)\LexAsm.obj                  \


@@ -59,20 +59,20 @@ OBJECTS = \
        $(OBJ_PATH)\LexRuby.obj                 \
        $(OBJ_PATH)\LexSQL.obj                  \
        $(OBJ_PATH)\LexVB.obj                   \
        $(OBJ_PATH)\LexRuby.obj                 \
        $(OBJ_PATH)\LexSQL.obj                  \
        $(OBJ_PATH)\LexVB.obj                   \

-        $(OBJ_PATH)\LineMarker.obj             \
-        $(OBJ_PATH)\PropSet.obj                        \
+    $(OBJ_PATH)\LineMarker.obj     \
+    $(OBJ_PATH)\PropSet.obj            \

        $(OBJ_PATH)\RESearch.obj                \
        $(OBJ_PATH)\RESearch.obj                \

-        $(OBJ_PATH)\ScintillaBase.obj          \
-        $(OBJ_PATH)\Style.obj                  \
-       $(OBJ_PATH)\StyleContext.obj            \
-       $(OBJ_PATH)\UniConversion.obj           \
-        $(OBJ_PATH)\ViewStyle.obj              \
-       $(OBJ_PATH)\WindowAccessor.obj          \
+    $(OBJ_PATH)\ScintillaBase.obj      \
+    $(OBJ_PATH)\Style.obj                      \
+       $(OBJ_PATH)\StyleContext.obj    \
+       $(OBJ_PATH)\UniConversion.obj   \
+    $(OBJ_PATH)\ViewStyle.obj          \
+       $(OBJ_PATH)\WindowAccessor.obj  \

        $(OBJ_PATH)\XPM.obj                     \
        $(OBJ_PATH)\XPM.obj                     \

-                                               \
-       $(OBJ_PATH)\PlatWX.obj                  \
-       $(OBJ_PATH)\ScintillaWX.obj             \
-       $(OBJ_PATH)\stc.obj                     \
+                                       \
+       $(OBJ_PATH)\PlatWX.obj          \
+       $(OBJ_PATH)\ScintillaWX.obj     \
+       $(OBJ_PATH)\stc.obj             \

 
 
 STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)
 
 
 STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)


@@ -80,10 +80,10 @@ STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) $(EXTRASTCCPPFLAGS)
 .path.obj = $(OBJ_PATH)
 
 {$(S)}.cxx.obj:
 .path.obj = $(OBJ_PATH)
 
 {$(S)}.cxx.obj:

-       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
+       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -n$(OBJ_PATH) {$< }

 
 .cpp.obj:
 
 .cpp.obj:

-       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -o$(OBJ_PATH)\$(<B).obj {$< }
+       bcc32 $(STCCPPFLAGS) $(CPPFLAGS) -P -c -n$(OBJ_PATH) {$< }

 
 !include $(WXDIR)\src\makelib.b32
 
 
 !include $(WXDIR)\src\makelib.b32