diff options
| -rw-r--r-- | gtk/deps.mak | 48 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 2 | ||||
| -rw-r--r-- | src/Platform.h (renamed from include/Platform.h) | 0 | ||||
| -rw-r--r-- | win32/deps.mak | 48 | ||||
| -rw-r--r-- | win32/nmdeps.mak | 48 | 
5 files changed, 73 insertions, 73 deletions
| diff --git a/gtk/deps.mak b/gtk/deps.mak index 19b1ff5b3..ee48fd53e 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -1,7 +1,7 @@  # Created by DepGen.py. To recreate, run DepGen.py.  PlatGTK.o: \  	PlatGTK.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../include/ScintillaWidget.h \ @@ -11,7 +11,7 @@ PlatGTK.o: \  	Converter.h  ScintillaGTK.o: \  	ScintillaGTK.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -51,7 +51,7 @@ ScintillaGTK.o: \  	Converter.h  ScintillaGTKAccessible.o: \  	ScintillaGTKAccessible.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -89,7 +89,7 @@ ScintillaGTKAccessible.o: \  	ScintillaGTKAccessible.h  AutoComplete.o: \  	../src/AutoComplete.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/CharacterSet.h \ @@ -97,7 +97,7 @@ AutoComplete.o: \  	../src/AutoComplete.h  CallTip.o: \  	../src/CallTip.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -113,7 +113,7 @@ CaseFolder.o: \  	../src/CaseConvert.h  CellBuffer.o: \  	../src/CellBuffer.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -133,7 +133,7 @@ CharClassify.o: \  	../src/CharClassify.h  ContractionState.o: \  	../src/ContractionState.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -146,7 +146,7 @@ DBCS.o: \  	../src/DBCS.h  Decoration.o: \  	../src/Decoration.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -156,7 +156,7 @@ Decoration.o: \  	../src/Decoration.h  Document.o: \  	../src/Document.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -178,7 +178,7 @@ Document.o: \  	../src/ElapsedPeriod.h  EditModel.o: \  	../src/EditModel.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -206,7 +206,7 @@ EditModel.o: \  	../src/EditModel.h  Editor.o: \  	../src/Editor.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -240,7 +240,7 @@ Editor.o: \  	../src/ElapsedPeriod.h  EditView.o: \  	../src/EditView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -274,7 +274,7 @@ EditView.o: \  	../src/ElapsedPeriod.h  Indicator.o: \  	../src/Indicator.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -282,13 +282,13 @@ Indicator.o: \  	../src/XPM.h  KeyMap.o: \  	../src/KeyMap.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/KeyMap.h  LineMarker.o: \  	../src/LineMarker.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -296,7 +296,7 @@ LineMarker.o: \  	../src/LineMarker.h  MarginView.o: \  	../src/MarginView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -327,7 +327,7 @@ MarginView.o: \  	../src/EditView.h  PerLine.o: \  	../src/PerLine.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -337,7 +337,7 @@ PerLine.o: \  	../src/PerLine.h  PositionCache.o: \  	../src/PositionCache.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -369,7 +369,7 @@ RESearch.o: \  	../src/RESearch.h  RunStyles.o: \  	../src/RunStyles.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -378,7 +378,7 @@ RunStyles.o: \  	../src/RunStyles.h  ScintillaBase.o: \  	../src/ScintillaBase.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -411,14 +411,14 @@ ScintillaBase.o: \  	../src/ScintillaBase.h  Selection.o: \  	../src/Selection.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \  	../src/Selection.h  Style.o: \  	../src/Style.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Style.h @@ -430,7 +430,7 @@ UniqueString.o: \  	../src/UniqueString.h  ViewStyle.o: \  	../src/ViewStyle.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -442,5 +442,5 @@ ViewStyle.o: \  	../src/ViewStyle.h  XPM.o: \  	../src/XPM.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/XPM.h diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 9678cc943..8b7a5000a 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -63,6 +63,7 @@ HEADERS  += \      ../../src/RunStyles.h \      ../../src/RESearch.h \      ../../src/PositionCache.h \ +    ../../src/Platform.h \      ../../src/PerLine.h \      ../../src/Partitioning.h \      ../../src/LineMarker.h \ @@ -82,7 +83,6 @@ HEADERS  += \      ../../src/CallTip.h \      ../../src/AutoComplete.h \      ../../include/Scintilla.h \ -    ../../include/Platform.h \      ../../include/ILexer.h  OTHER_FILES += diff --git a/include/Platform.h b/src/Platform.h index 628611132..628611132 100644 --- a/include/Platform.h +++ b/src/Platform.h diff --git a/win32/deps.mak b/win32/deps.mak index c7f7c748c..0f7bb2937 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -5,7 +5,7 @@ HanjaDic.o: \  	HanjaDic.h  PlatWin.o: \  	PlatWin.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/XPM.h \  	../src/UniConversion.h \  	../src/DBCS.h \ @@ -18,7 +18,7 @@ ScintillaDLL.o: \  	ScintillaWin.h  ScintillaWin.o: \  	ScintillaWin.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -57,7 +57,7 @@ ScintillaWin.o: \  	ScintillaWin.h  AutoComplete.o: \  	../src/AutoComplete.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/CharacterSet.h \ @@ -65,7 +65,7 @@ AutoComplete.o: \  	../src/AutoComplete.h  CallTip.o: \  	../src/CallTip.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -81,7 +81,7 @@ CaseFolder.o: \  	../src/CaseConvert.h  CellBuffer.o: \  	../src/CellBuffer.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -101,7 +101,7 @@ CharClassify.o: \  	../src/CharClassify.h  ContractionState.o: \  	../src/ContractionState.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -114,7 +114,7 @@ DBCS.o: \  	../src/DBCS.h  Decoration.o: \  	../src/Decoration.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -124,7 +124,7 @@ Decoration.o: \  	../src/Decoration.h  Document.o: \  	../src/Document.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -146,7 +146,7 @@ Document.o: \  	../src/ElapsedPeriod.h  EditModel.o: \  	../src/EditModel.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -174,7 +174,7 @@ EditModel.o: \  	../src/EditModel.h  Editor.o: \  	../src/Editor.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -208,7 +208,7 @@ Editor.o: \  	../src/ElapsedPeriod.h  EditView.o: \  	../src/EditView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -242,7 +242,7 @@ EditView.o: \  	../src/ElapsedPeriod.h  Indicator.o: \  	../src/Indicator.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -250,13 +250,13 @@ Indicator.o: \  	../src/XPM.h  KeyMap.o: \  	../src/KeyMap.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/KeyMap.h  LineMarker.o: \  	../src/LineMarker.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -264,7 +264,7 @@ LineMarker.o: \  	../src/LineMarker.h  MarginView.o: \  	../src/MarginView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -295,7 +295,7 @@ MarginView.o: \  	../src/EditView.h  PerLine.o: \  	../src/PerLine.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -305,7 +305,7 @@ PerLine.o: \  	../src/PerLine.h  PositionCache.o: \  	../src/PositionCache.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -337,7 +337,7 @@ RESearch.o: \  	../src/RESearch.h  RunStyles.o: \  	../src/RunStyles.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -346,7 +346,7 @@ RunStyles.o: \  	../src/RunStyles.h  ScintillaBase.o: \  	../src/ScintillaBase.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -379,7 +379,7 @@ ScintillaBase.o: \  	../src/ScintillaBase.h  ScintillaBaseL.o: \  	../src/ScintillaBase.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -412,14 +412,14 @@ ScintillaBaseL.o: \  	../src/ScintillaBase.h  Selection.o: \  	../src/Selection.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \  	../src/Selection.h  Style.o: \  	../src/Style.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Style.h @@ -431,7 +431,7 @@ UniqueString.o: \  	../src/UniqueString.h  ViewStyle.o: \  	../src/ViewStyle.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -443,5 +443,5 @@ ViewStyle.o: \  	../src/ViewStyle.h  XPM.o: \  	../src/XPM.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/XPM.h diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak index 0f7ab1f33..701731378 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -5,7 +5,7 @@ $(DIR_O)/HanjaDic.obj: \  	HanjaDic.h  $(DIR_O)/PlatWin.obj: \  	PlatWin.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/XPM.h \  	../src/UniConversion.h \  	../src/DBCS.h \ @@ -18,7 +18,7 @@ $(DIR_O)/ScintillaDLL.obj: \  	ScintillaWin.h  $(DIR_O)/ScintillaWin.obj: \  	ScintillaWin.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -57,7 +57,7 @@ $(DIR_O)/ScintillaWin.obj: \  	ScintillaWin.h  $(DIR_O)/AutoComplete.obj: \  	../src/AutoComplete.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/CharacterSet.h \ @@ -65,7 +65,7 @@ $(DIR_O)/AutoComplete.obj: \  	../src/AutoComplete.h  $(DIR_O)/CallTip.obj: \  	../src/CallTip.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -81,7 +81,7 @@ $(DIR_O)/CaseFolder.obj: \  	../src/CaseConvert.h  $(DIR_O)/CellBuffer.obj: \  	../src/CellBuffer.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -101,7 +101,7 @@ $(DIR_O)/CharClassify.obj: \  	../src/CharClassify.h  $(DIR_O)/ContractionState.obj: \  	../src/ContractionState.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/Position.h \  	../src/UniqueString.h \  	../src/SplitVector.h \ @@ -114,7 +114,7 @@ $(DIR_O)/DBCS.obj: \  	../src/DBCS.h  $(DIR_O)/Decoration.obj: \  	../src/Decoration.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -124,7 +124,7 @@ $(DIR_O)/Decoration.obj: \  	../src/Decoration.h  $(DIR_O)/Document.obj: \  	../src/Document.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -146,7 +146,7 @@ $(DIR_O)/Document.obj: \  	../src/ElapsedPeriod.h  $(DIR_O)/EditModel.obj: \  	../src/EditModel.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -174,7 +174,7 @@ $(DIR_O)/EditModel.obj: \  	../src/EditModel.h  $(DIR_O)/Editor.obj: \  	../src/Editor.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -208,7 +208,7 @@ $(DIR_O)/Editor.obj: \  	../src/ElapsedPeriod.h  $(DIR_O)/EditView.obj: \  	../src/EditView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -242,7 +242,7 @@ $(DIR_O)/EditView.obj: \  	../src/ElapsedPeriod.h  $(DIR_O)/Indicator.obj: \  	../src/Indicator.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -250,13 +250,13 @@ $(DIR_O)/Indicator.obj: \  	../src/XPM.h  $(DIR_O)/KeyMap.obj: \  	../src/KeyMap.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/KeyMap.h  $(DIR_O)/LineMarker.obj: \  	../src/LineMarker.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/IntegerRectangle.h \ @@ -264,7 +264,7 @@ $(DIR_O)/LineMarker.obj: \  	../src/LineMarker.h  $(DIR_O)/MarginView.obj: \  	../src/MarginView.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -295,7 +295,7 @@ $(DIR_O)/MarginView.obj: \  	../src/EditView.h  $(DIR_O)/PerLine.obj: \  	../src/PerLine.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -305,7 +305,7 @@ $(DIR_O)/PerLine.obj: \  	../src/PerLine.h  $(DIR_O)/PositionCache.obj: \  	../src/PositionCache.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -337,7 +337,7 @@ $(DIR_O)/RESearch.obj: \  	../src/RESearch.h  $(DIR_O)/RunStyles.obj: \  	../src/RunStyles.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -346,7 +346,7 @@ $(DIR_O)/RunStyles.obj: \  	../src/RunStyles.h  $(DIR_O)/ScintillaBase.obj: \  	../src/ScintillaBase.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -379,7 +379,7 @@ $(DIR_O)/ScintillaBase.obj: \  	../src/ScintillaBase.h  $(DIR_O)/ScintillaBaseL.obj: \  	../src/ScintillaBase.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/ILoader.h \  	../include/Sci_Position.h \  	../include/ILexer.h \ @@ -412,14 +412,14 @@ $(DIR_O)/ScintillaBaseL.obj: \  	../src/ScintillaBase.h  $(DIR_O)/Selection.obj: \  	../src/Selection.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \  	../src/Selection.h  $(DIR_O)/Style.obj: \  	../src/Style.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Style.h @@ -431,7 +431,7 @@ $(DIR_O)/UniqueString.obj: \  	../src/UniqueString.h  $(DIR_O)/ViewStyle.obj: \  	../src/ViewStyle.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../include/Scintilla.h \  	../include/Sci_Position.h \  	../src/Position.h \ @@ -443,5 +443,5 @@ $(DIR_O)/ViewStyle.obj: \  	../src/ViewStyle.h  $(DIR_O)/XPM.obj: \  	../src/XPM.cxx \ -	../include/Platform.h \ +	../src/Platform.h \  	../src/XPM.h | 
