Merge pull request #6709 from keymanapp/chore/windows/move-scfontcombobox

chore(windows): move scfontcombobox to developer 🎢
2026-08-14 12:49:25 +00:00 · 2022-06-18 11:45:45 +10:00 · 2022-06-18 11:45:45 +10:00 · 74dbce6ccc
commit 74dbce6ccc
parent d41268978a 8fa66f0b3e
12 changed files with 8 additions and 12 deletions
--- a/common/windows/delphi/ext/Makefile
+++ b/common/windows/delphi/ext/Makefile
@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=dcpcrypt #jedi scfontcombobox cef4delphi
+TARGETS=dcpcrypt #jedi cef4delphi
 !endif

 # jedi has no packages
@ -30,10 +30,6 @@ jedi: .virtual
    cd $(COMMON_ROOT)\ext\jedi
    $(MAKE) $(TARGET)

-scfontcombobox: .virtual
-    cd $(COMMON_ROOT)\ext\scfontcombobox
-    $(MAKE) $(TARGET)
-
 #
 #
 #
--- a/developer/src/ext/Makefile
+++ b/developer/src/ext/Makefile
@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=browse4folder mbcolor common
+TARGETS=browse4folder mbcolor scfontcombobox common
 !endif

 CLEANS=
@ -24,6 +24,10 @@ mbcolor: .virtual
    cd $(DEVELOPER_ROOT)\src\ext\mbcolor
    $(MAKE) $(TARGET)

+scfontcombobox: .virtual
+    cd $(DEVELOPER_ROOT)\src\ext\scfontcombobox
+    $(MAKE) $(TARGET)
+
 # ----------------------------------------------------------------------

 common: .virtual
--- a/developer/src/ext/scfontcombobox/Makefile
+++ b/developer/src/ext/scfontcombobox/Makefile
@ -11,7 +11,7 @@ build: dirs

 install:
    $(DEVTOOLS) -ip $(OUTLIB)\scFontCombo.bpl
-    $(DEVTOOLS) -ai $(EXT)\scfontcombobox
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\scfontcombobox

 clean: def-clean

--- a/developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm
+++ b/developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm
--- a/developer/src/ext/scfontcombobox/scFontCombo.dpk
+++ b/developer/src/ext/scfontcombobox/scFontCombo.dpk
--- a/developer/src/ext/scfontcombobox/scFontCombo.dproj
+++ b/developer/src/ext/scfontcombobox/scFontCombo.dproj
--- a/developer/src/ext/scfontcombobox/scFontCombo.res
+++ b/developer/src/ext/scfontcombobox/scFontCombo.res
--- a/developer/src/ext/scfontcombobox/scFontComboBox.dcr
+++ b/developer/src/ext/scfontcombobox/scFontComboBox.dcr
--- a/developer/src/ext/scfontcombobox/scFontComboBox.res
+++ b/developer/src/ext/scfontcombobox/scFontComboBox.res
--- a/developer/src/ext/scfontcombobox/scFontCombobox.dfm
+++ b/developer/src/ext/scfontcombobox/scFontCombobox.dfm
--- a/developer/src/ext/scfontcombobox/scFontCombobox.pas
+++ b/developer/src/ext/scfontcombobox/scFontCombobox.pas
--- a/windows/src/ext/Makefile
+++ b/windows/src/ext/Makefile
@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=common jedi scfontcombobox cef4delphi
+TARGETS=common jedi cef4delphi
 !endif

 # jedi has no packages
@ -36,10 +36,6 @@ vclzip: .virtual
    cd $(ROOT)\src\ext\vclzip
    $(MAKE) $(TARGET)

-scfontcombobox: .virtual
-    cd $(ROOT)\src\ext\scfontcombobox
-    $(MAKE) $(TARGET)
-
 #
 #
 #