diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/DepGen.py | 3 | ||||
| -rw-r--r-- | win32/deps.mak | 70 | ||||
| -rw-r--r-- | win32/makefile | 81 |
3 files changed, 79 insertions, 75 deletions
diff --git a/win32/DepGen.py b/win32/DepGen.py index f2cbb4838..cd38367c3 100644 --- a/win32/DepGen.py +++ b/win32/DepGen.py @@ -19,6 +19,9 @@ def Generate(): # Create the dependencies file for g++ deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sources, ["../win32"] + includes, ".o", "../win32/") + # Place the objects in $(DIR_O) + deps = [["$(DIR_O)/"+obj, headers] for obj, headers in deps] + Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment) # Create the dependencies file for MSVC diff --git a/win32/deps.mak b/win32/deps.mak index 61798b358..699297a60 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,9 +1,9 @@ # Created by DepGen.py. To recreate, run DepGen.py. -HanjaDic.o: \ +$(DIR_O)/HanjaDic.o: \ HanjaDic.cxx \ WinTypes.h \ HanjaDic.h -PlatWin.o: \ +$(DIR_O)/PlatWin.o: \ PlatWin.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -14,11 +14,11 @@ PlatWin.o: \ ../src/DBCS.h \ WinTypes.h \ PlatWin.h -ScintillaDLL.o: \ +$(DIR_O)/ScintillaDLL.o: \ ScintillaDLL.cxx \ ../include/ScintillaTypes.h \ ScintillaWin.h -ScintillaWin.o: \ +$(DIR_O)/ScintillaWin.o: \ ScintillaWin.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -62,7 +62,7 @@ ScintillaWin.o: \ PlatWin.h \ HanjaDic.h \ ScintillaWin.h -AutoComplete.o: \ +$(DIR_O)/AutoComplete.o: \ ../src/AutoComplete.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -72,7 +72,7 @@ AutoComplete.o: \ ../src/CharacterType.h \ ../src/Position.h \ ../src/AutoComplete.h -CallTip.o: \ +$(DIR_O)/CallTip.o: \ ../src/CallTip.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -81,15 +81,15 @@ CallTip.o: \ ../src/Platform.h \ ../src/Position.h \ ../src/CallTip.h -CaseConvert.o: \ +$(DIR_O)/CaseConvert.o: \ ../src/CaseConvert.cxx \ ../src/CaseConvert.h \ ../src/UniConversion.h -CaseFolder.o: \ +$(DIR_O)/CaseFolder.o: \ ../src/CaseFolder.cxx \ ../src/CaseFolder.h \ ../src/CaseConvert.h -CellBuffer.o: \ +$(DIR_O)/CellBuffer.o: \ ../src/CellBuffer.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -98,17 +98,17 @@ CellBuffer.o: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/UniConversion.h -CharacterCategoryMap.o: \ +$(DIR_O)/CharacterCategoryMap.o: \ ../src/CharacterCategoryMap.cxx \ ../src/CharacterCategoryMap.h -CharacterType.o: \ +$(DIR_O)/CharacterType.o: \ ../src/CharacterType.cxx \ ../src/CharacterType.h -CharClassify.o: \ +$(DIR_O)/CharClassify.o: \ ../src/CharClassify.cxx \ ../src/CharacterType.h \ ../src/CharClassify.h -ContractionState.o: \ +$(DIR_O)/ContractionState.o: \ ../src/ContractionState.cxx \ ../src/Debugging.h \ ../src/Position.h \ @@ -118,10 +118,10 @@ ContractionState.o: \ ../src/RunStyles.h \ ../src/SparseVector.h \ ../src/ContractionState.h -DBCS.o: \ +$(DIR_O)/DBCS.o: \ ../src/DBCS.cxx \ ../src/DBCS.h -Decoration.o: \ +$(DIR_O)/Decoration.o: \ ../src/Decoration.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -130,7 +130,7 @@ Decoration.o: \ ../src/Partitioning.h \ ../src/RunStyles.h \ ../src/Decoration.h -Document.o: \ +$(DIR_O)/Document.o: \ ../src/Document.cxx \ ../include/ScintillaTypes.h \ ../include/ILoader.h \ @@ -152,7 +152,7 @@ Document.o: \ ../src/RESearch.h \ ../src/UniConversion.h \ ../src/ElapsedPeriod.h -EditModel.o: \ +$(DIR_O)/EditModel.o: \ ../src/EditModel.cxx \ ../include/ScintillaTypes.h \ ../include/ILoader.h \ @@ -181,7 +181,7 @@ EditModel.o: \ ../src/Selection.h \ ../src/PositionCache.h \ ../src/EditModel.h -Editor.o: \ +$(DIR_O)/Editor.o: \ ../src/Editor.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -220,7 +220,7 @@ Editor.o: \ ../src/EditView.h \ ../src/Editor.h \ ../src/ElapsedPeriod.h -EditView.o: \ +$(DIR_O)/EditView.o: \ ../src/EditView.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -257,10 +257,10 @@ EditView.o: \ ../src/MarginView.h \ ../src/EditView.h \ ../src/ElapsedPeriod.h -Geometry.o: \ +$(DIR_O)/Geometry.o: \ ../src/Geometry.cxx \ ../src/Geometry.h -Indicator.o: \ +$(DIR_O)/Indicator.o: \ ../src/Indicator.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -268,13 +268,13 @@ Indicator.o: \ ../src/Platform.h \ ../src/Indicator.h \ ../src/XPM.h -KeyMap.o: \ +$(DIR_O)/KeyMap.o: \ ../src/KeyMap.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ ../src/Debugging.h \ ../src/KeyMap.h -LineMarker.o: \ +$(DIR_O)/LineMarker.o: \ ../src/LineMarker.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -283,7 +283,7 @@ LineMarker.o: \ ../src/XPM.h \ ../src/LineMarker.h \ ../src/UniConversion.h -MarginView.o: \ +$(DIR_O)/MarginView.o: \ ../src/MarginView.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -317,7 +317,7 @@ MarginView.o: \ ../src/EditModel.h \ ../src/MarginView.h \ ../src/EditView.h -PerLine.o: \ +$(DIR_O)/PerLine.o: \ ../src/PerLine.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -328,7 +328,7 @@ PerLine.o: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/PerLine.h -PositionCache.o: \ +$(DIR_O)/PositionCache.o: \ ../src/PositionCache.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -359,19 +359,19 @@ PositionCache.o: \ ../src/UniConversion.h \ ../src/Selection.h \ ../src/PositionCache.h -RESearch.o: \ +$(DIR_O)/RESearch.o: \ ../src/RESearch.cxx \ ../src/Position.h \ ../src/CharClassify.h \ ../src/RESearch.h -RunStyles.o: \ +$(DIR_O)/RunStyles.o: \ ../src/RunStyles.cxx \ ../src/Debugging.h \ ../src/Position.h \ ../src/SplitVector.h \ ../src/Partitioning.h \ ../src/RunStyles.h -ScintillaBase.o: \ +$(DIR_O)/ScintillaBase.o: \ ../src/ScintillaBase.cxx \ ../include/ScintillaTypes.h \ ../include/ScintillaMessages.h \ @@ -408,25 +408,25 @@ ScintillaBase.o: \ ../src/Editor.h \ ../src/AutoComplete.h \ ../src/ScintillaBase.h -Selection.o: \ +$(DIR_O)/Selection.o: \ ../src/Selection.cxx \ ../src/Debugging.h \ ../src/Position.h \ ../src/Selection.h -Style.o: \ +$(DIR_O)/Style.o: \ ../src/Style.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ ../src/Geometry.h \ ../src/Platform.h \ ../src/Style.h -UniConversion.o: \ +$(DIR_O)/UniConversion.o: \ ../src/UniConversion.cxx \ ../src/UniConversion.h -UniqueString.o: \ +$(DIR_O)/UniqueString.o: \ ../src/UniqueString.cxx \ ../src/UniqueString.h -ViewStyle.o: \ +$(DIR_O)/ViewStyle.o: \ ../src/ViewStyle.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ @@ -439,7 +439,7 @@ ViewStyle.o: \ ../src/LineMarker.h \ ../src/Style.h \ ../src/ViewStyle.h -XPM.o: \ +$(DIR_O)/XPM.o: \ ../src/XPM.cxx \ ../include/ScintillaTypes.h \ ../src/Debugging.h \ diff --git a/win32/makefile b/win32/makefile index d13cc184c..430261f3e 100644 --- a/win32/makefile +++ b/win32/makefile @@ -9,6 +9,7 @@ .SUFFIXES: .cxx .c .o .h .a +DIR_O=. DIR_BIN=../bin COMPONENT = $(DIR_BIN)/Scintilla.dll @@ -68,10 +69,10 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) all: $(COMPONENT) $(LIBSCI) clean: - $(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI)) + $(DEL) $(call normalize, $(addprefix $(DIR_O)/, *.exe *.o *.a *.obj *.dll *.res *.map *.plist) $(COMPONENT) $(LIBSCI)) -%.o: %.cxx - $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $< +$(DIR_O)/%.o: %.cxx + $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $< -o $@ analyze: $(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx @@ -81,47 +82,47 @@ depend deps.mak: # Required for base Scintilla SRC_OBJS = \ - AutoComplete.o \ - CallTip.o \ - CaseConvert.o \ - CaseFolder.o \ - CellBuffer.o \ - CharacterCategoryMap.o \ - CharacterType.o \ - CharClassify.o \ - ContractionState.o \ - DBCS.o \ - Decoration.o \ - Document.o \ - EditModel.o \ - Editor.o \ - EditView.o \ - Geometry.o \ - Indicator.o \ - KeyMap.o \ - LineMarker.o \ - MarginView.o \ - PerLine.o \ - PositionCache.o \ - RESearch.o \ - RunStyles.o \ - Selection.o \ - Style.o \ - UniConversion.o \ - UniqueString.o \ - ViewStyle.o \ - XPM.o + $(DIR_O)/AutoComplete.o \ + $(DIR_O)/CallTip.o \ + $(DIR_O)/CaseConvert.o \ + $(DIR_O)/CaseFolder.o \ + $(DIR_O)/CellBuffer.o \ + $(DIR_O)/CharacterCategoryMap.o \ + $(DIR_O)/CharacterType.o \ + $(DIR_O)/CharClassify.o \ + $(DIR_O)/ContractionState.o \ + $(DIR_O)/DBCS.o \ + $(DIR_O)/Decoration.o \ + $(DIR_O)/Document.o \ + $(DIR_O)/EditModel.o \ + $(DIR_O)/Editor.o \ + $(DIR_O)/EditView.o \ + $(DIR_O)/Geometry.o \ + $(DIR_O)/Indicator.o \ + $(DIR_O)/KeyMap.o \ + $(DIR_O)/LineMarker.o \ + $(DIR_O)/MarginView.o \ + $(DIR_O)/PerLine.o \ + $(DIR_O)/PositionCache.o \ + $(DIR_O)/RESearch.o \ + $(DIR_O)/RunStyles.o \ + $(DIR_O)/Selection.o \ + $(DIR_O)/Style.o \ + $(DIR_O)/UniConversion.o \ + $(DIR_O)/UniqueString.o \ + $(DIR_O)/ViewStyle.o \ + $(DIR_O)/XPM.o COMPONENT_OBJS = \ $(SRC_OBJS) \ - HanjaDic.o \ - PlatWin.o \ - ScintillaBase.o \ - ScintillaWin.o + $(DIR_O)/HanjaDic.o \ + $(DIR_O)/PlatWin.o \ + $(DIR_O)/ScintillaBase.o \ + $(DIR_O)/ScintillaWin.o SHARED_OBJS = \ - ScintillaDLL.o \ - ScintRes.o + $(DIR_O)/ScintillaDLL.o \ + $(DIR_O)/ScintRes.o $(COMPONENT): $(COMPONENT_OBJS) $(SHARED_OBJS) $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS) @@ -133,6 +134,6 @@ $(LIBSCI): $(COMPONENT_OBJS) # Automatically generate dependencies for most files with "make deps" include deps.mak -ScintRes.o: ScintRes.rc +$(DIR_O)/ScintRes.o: ScintRes.rc $(WINDRES) $< $@ |