Skip to content

Commit dcb02bf

Browse files
jerstlouisjerstlouis
committed
ecere; eda; extras/testing: Automated static builds
1 parent 01e5a72 commit dcb02bf

File tree

13 files changed

+3801
-33
lines changed

13 files changed

+3801
-33
lines changed

‎.onedev-buildspec.yml

+50-29
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,42 @@ jobs:
6161
- apt -y install git
6262
- apt -y install python3-pip
6363
- pip3 install cffi
64-
- make -j2 && mkdir output && make install DESTDIR=output && rm /usr/bin/gcc
65-
&& rm /usr/bin/g++ && ln -s /usr/bin/gcc-8 /usr/bin/gcc && ln -s /usr/bin/g++-8
66-
/usr/bin/g++ && make bindings && rm /usr/bin/gcc && rm /usr/bin/g++ && ln
67-
-s /usr/bin/gcc-7 /usr/bin/gcc && ln -s /usr/bin/g++-7 /usr/bin/g++ && apt
68-
-y install libgif-dev:i386 && make ARCH=x32 -j2 && make ARCH=x32 install DESTDIR=output
69-
&& tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
70-
extras butterbur/src compiler/eccss ecere/src ide/src/designer/SyntaxHighlighting.ec
71-
ide/src/designer/SyntaxColorScheme.ec ide/res/actions default.cf crossplatform.mk
72-
&& cd output && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
73-
* && cd .. && cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-linux-x86_64.tar.gz
64+
- make -j2 && mkdir output && make install DESTDIR=output &&
65+
rm /usr/bin/gcc && rm /usr/bin/g++ && ln -s /usr/bin/gcc-8 /usr/bin/gcc && ln -s /usr/bin/g++-8 /usr/bin/g++ &&
66+
make bindings &&
67+
rm /usr/bin/gcc && rm /usr/bin/g++ && ln -s /usr/bin/gcc-7 /usr/bin/gcc && ln -s /usr/bin/g++-7 /usr/bin/g++ &&
68+
apt -y install libgif-dev:i386 &&
69+
make ARCH=x32 -j2 && make ARCH=x32 install DESTDIR=output &&
70+
tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
71+
extras butterbur/src compiler/eccss ecere/src ide/src/designer/SyntaxHighlighting.ec ide/src/designer/SyntaxColorScheme.ec
72+
ide/res/actions default.cf crossplatform.mk &&
73+
cd output && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] * &&
74+
cd .. && cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-linux-x86_64.tar.gz
7475
linux && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
75-
linux.x32 && cd .. && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-bindings-linux-x86_64.tar.gz
76-
bindings && wget https://ecere.com/tmp/win32-patches.tar.gz && tar xf win32-patches.tar.gz
77-
&& ln -s $(pwd)/win32/regex/regex.h /usr/x86_64-w64-mingw32/include/ && ln
78-
-s $(pwd)/win32/regex/gnurx-0.dll /usr/x86_64-w64-mingw32/lib/ && ln -s $(pwd)/win32/regex/regex.h
79-
/usr/i686-w64-mingw32/include/ && ln -s $(pwd)/win32/regex-x32/libgnurx-0.dll
80-
/usr/i686-w64-mingw32/lib/ && apt -y install libgif-dev && make PLATFORM=win32
81-
OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg && mkdir output-win32 &&
82-
make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg DESTDIR=output-win32
83-
install && cd output-win32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-output-windows-x86_64.tar.gz
84-
* && cd .. && apt -y install libgif-dev:i386 && make PLATFORM=win32 ARCH=x32
85-
OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg && mkdir output-win32-x32
86-
&& make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg
87-
DESTDIR=output-win32-x32 install && cd output-win32-x32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
88-
* && cd .. && make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg
89-
installer && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
90-
deps && cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-windows-x86_64.tar.gz
91-
win32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
92-
win32.x32 && cd .. && cp installer/obj/release.win32.x32/setup-ecere-0.44.16pre-win32.exe
93-
@project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
76+
linux.x32 && cd .. && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-bindings-linux-x86_64.tar.gz bindings &&
77+
wget https://ecere.com/tmp/win32-patches.tar.gz && tar xf win32-patches.tar.gz &&
78+
ln -s $(pwd)/win32/regex/regex.h /usr/x86_64-w64-mingw32/include/ &&
79+
ln -s $(pwd)/win32/regex/gnurx-0.dll /usr/x86_64-w64-mingw32/lib/ &&
80+
ln -s $(pwd)/win32/regex/regex.h /usr/i686-w64-mingw32/include/ &&
81+
ln -s $(pwd)/win32/regex-x32/libgnurx-0.dll /usr/i686-w64-mingw32/lib/ &&
82+
tar xf OpenSSL-win32/OpenSSL-win32*.tar.gz -C $(pwd)/win32 &&
83+
tar xf curl-win32/curl*windows-x86_64.tar.gz -C $(pwd)/deps &&
84+
tar xf curl-win32/curl*windows-i686.tar.gz -C $(pwd)/deps &&
85+
apt -y install libgif-dev &&
86+
make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg &&
87+
mkdir output-win32 &&
88+
make PLATFORM=win32 OPENSSL_CONF=$(pwd)/win32/openssl/bin/openssl.cfg DESTDIR=output-win32 install &&
89+
cd output-win32 &&
90+
tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-output-windows-x86_64.tar.gz * &&
91+
cd .. && apt -y install libgif-dev:i386 && make PLATFORM=win32 ARCH=x32
92+
OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg && mkdir output-win32-x32 &&
93+
make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg DESTDIR=output-win32-x32 install &&
94+
cd output-win32-x32 && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] * &&
95+
cd .. && make PLATFORM=win32 ARCH=x32 OPENSSL_CONF=$(pwd)/win32/openssl-x32/bin/openssl.cfg installer &&
96+
tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] deps &&
97+
cd obj && tar czf @project_name@-@tag@-@branch@-@commit_hash@-@build_number@-binaries-windows-x86_64.tar.gz win32 &&
98+
tar czf @project_name@-@tag@-@branch@-@commit_hash@-@[email protected] win32.x32 &&
99+
cd .. && cp installer/obj/release.win32.x32/setup-ecere-0.44.16pre-win32.exe @project_name@-@tag@-@branch@-@commit_hash@-@[email protected]
94100
useTTY: true
95101
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
96102
- !PublishArtifactStep
@@ -153,6 +159,21 @@ jobs:
153159
projects: ecere-sdk
154160
- !BranchUpdateTrigger
155161
projects: ecere-sdk
162+
projectDependencies:
163+
- projectPath: OpenSSL-win32
164+
buildProvider: !LastFinishedBuild
165+
jobName: Build
166+
refName: refs/heads/master
167+
artifacts: '**'
168+
accessTokenSecret: ssl-access
169+
destinationPath: OpenSSL-win32
170+
- projectPath: curl
171+
buildProvider: !LastFinishedBuild
172+
jobName: Build
173+
refName: refs/heads/7.51
174+
artifacts: '**'
175+
accessTokenSecret: ssl-access
176+
destinationPath: curl-win32
156177
retryCondition: never
157178
maxRetries: 3
158179
retryDelay: 30

‎Makefile

+82-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ifneq ($(V),1)
22
.SILENT:
33
endif
44

5-
.PHONY: all clean realclean wipeclean distclean emptyoutput prepinstall actualinstall install copyonlyinstall uninstall troubleshoot outputdirs bootstrap deps ecere ecerecom ecerevanilla ear compiler prepbinaries epj2make libec2 bgen ide documentor eda prepcodeguard codeguard fixprecompile cleantarget pots installer regenbootstrap updatebootstrap update_ecere update_libec update_ecp update_ecc update_ecs ecereaudio
5+
.PHONY: all clean realclean wipeclean distclean emptyoutput prepinstall actualinstall install copyonlyinstall uninstall troubleshoot outputdirs bootstrap deps ecere ecerecom ecerevanilla ecerestatic ear compiler prepbinaries epj2make libec2 bgen ide documentor eda prepcodeguard codeguard fixprecompile cleantarget pots installer regenbootstrap updatebootstrap update_ecere update_libec update_ecp update_ecc update_ecs ecereaudio
66

77
ROOT_ABSPATH := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
88
_CF_DIR = $(ROOT_ABSPATH)
@@ -45,6 +45,15 @@ ifndef DISABLE_EDA_dBASE
4545
EDAdBASE := defined
4646
endif
4747

48+
ifndef DISABLE_EDA_STATIC
49+
EDA_STATIC := defined
50+
endif
51+
52+
ifndef DISABLE_ECERE_STATIC
53+
ECERE_STATIC := defined
54+
endif
55+
56+
4857
ifdef WINDOWS_HOST
4958
HOST_SOV := $(HOST_SO)
5059
else
@@ -259,6 +268,10 @@ ecerevanilla: bootstrap
259268
@$(call echo,Building Vanilla Ecere...)
260269
+cd ecere && $(_MAKE) -f Makefile.vanilla
261270

271+
ecerestatic: bootstrap
272+
@$(call echo,Building Static Ecere...)
273+
+cd ecere && $(_MAKE) -f Makefile.static
274+
262275
ear: ecere ecerevanilla
263276
@$(call echo,Building ear...)
264277
+cd ear && cd cmd && $(_MAKE) cleantarget
@@ -275,7 +288,7 @@ endif
275288
@$(call echo,Building 2nd stage compiler)
276289
+cd compiler && $(_MAKE)
277290

278-
prepbinaries: compiler libec2 ecerecom
291+
prepbinaries: compiler libec2 ecerecom ecerestatic
279292
@$(call echo,Enabling 2nd stage binaries...)
280293
ifdef WINDOWS_TARGET
281294
$(call cp,ecere/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ecere$(SOV),$(OBJBINDIR))
@@ -412,15 +425,24 @@ endif
412425

413426
emptyoutput: outputdirs
414427
$(call rm,$(OBJLIBDIR)libecereVanilla$(A))
428+
ifdef ECERE_STATIC
429+
$(call rm,$(OBJLIBDIR)libecereStatic$(A))
430+
endif
415431
$(call rm,$(SODESTDIR)$(LP)ecere$(SO))
416432
$(call rm,$(SODESTDIR)$(LP)ecereCOM$(SO))
417433
$(call rm,$(SODESTDIR)$(LP)ec$(SO))
418434
$(call rm,$(SODESTDIR)$(LP)EDA$(SO))
435+
ifdef EDA_STATIC
436+
$(call rm,$(OBJLIBDIR)libEDAStatic$(A))
437+
endif
419438
ifdef EDAdBASE
420439
$(call rm,$(SODESTDIR)$(LP)EDAdBASE$(SO))
421440
endif
422441
ifdef EDASQLite
423442
$(call rm,$(SODESTDIR)$(LP)EDASQLite$(SO))
443+
ifdef EDA_STATIC
444+
$(call rm,$(OBJLIBDIR)libEDASQLiteStatic$(A))
445+
endif
424446
endif
425447
ifdef EDASQLiteCipher
426448
$(call rm,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO))
@@ -586,12 +608,25 @@ BINARIES = \
586608
bgen/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bgen$(B32_SFX)$(E) \
587609
eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV)
588610

611+
ifdef ECERE_STATIC
612+
BINARIES += \
613+
ecere/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libecereStatic$(A)
614+
endif
615+
616+
ifdef EDA_STATIC
617+
BINARIES += \
618+
eda/libeda/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libEDAStatic$(A)
619+
endif
589620
ifdef EDAdBASE
590621
BINARIES += eda/drivers/dbase/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDAdBASE$(SOV)
591622
endif
592623
ifdef EDASQLite
593624
BINARIES += \
594625
eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV)
626+
ifdef EDA_STATIC
627+
BINARIES += \
628+
eda/drivers/sqlite/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libEDASQLiteStatic$(A)
629+
endif
595630
endif
596631

597632
ifndef ECERE_PYTHON_PACKAGE
@@ -713,11 +748,17 @@ ifndef LINUX_TARGET
713748
$(call cp,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SO),$(OBJLIBDIR))
714749
$(call cp,compiler/libec2/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec2$(SO),$(OBJLIBDIR))
715750
$(call cp,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO),$(OBJLIBDIR))
751+
ifdef EDA_STATIC
752+
$(call cp,eda/libeda/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libEDAStatic$(A),$(OBJLIBDIR))
753+
endif
716754
ifdef EDAdBASE
717755
$(call cp,eda/drivers/dbase/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDAdBASE$(SO),$(OBJLIBDIR))
718756
endif
719757
ifdef EDASQLite
720758
$(call cp,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO),$(OBJLIBDIR))
759+
ifdef EDA_STATIC
760+
$(call cp,eda/drivers/sqlite/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libEDASQLiteStatic$(A),$(OBJLIBDIR))
761+
endif
721762
endif
722763
ifneq ($(ECERE_AUDIO),n)
723764
$(call cp,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJLIBDIR))
@@ -742,6 +783,9 @@ ifdef CodeGuard
742783
$(call cp,codeGuard/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/CodeGuard$(E),$(OBJBINDIR))
743784
endif
744785
$(call cp,ecere/obj/vanilla.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libecereVanilla$(A),$(OBJLIBDIR))
786+
ifdef ECERE_STATIC
787+
$(call cp,ecere/obj/static.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/libecereStatic$(A),$(OBJLIBDIR))
788+
endif
745789

746790
.PHONY: prepinstall32
747791
prepinstall32:
@@ -776,11 +820,17 @@ ifdef WINDOWS_TARGET
776820
$(call cp,$(OBJBINDIR)$(LP)ec$(SO),"$(DESTLIBDIR)/")
777821
$(call cp,$(OBJBINDIR)$(LP)ec2$(SO),"$(DESTLIBDIR)/")
778822
$(call cp,$(OBJBINDIR)$(LP)EDA$(SO),"$(DESTLIBDIR)/")
823+
ifdef EDA_STATIC
824+
$(call cp,$(OBJLIBDIR)libEDAStatic$(A),"$(DESTSLIBDIR)/")
825+
endif
779826
ifdef EDAdBASE
780827
$(call cp,$(OBJBINDIR)$(LP)EDAdBASE$(SO),"$(DESTLIBDIR)/")
781828
endif
782829
ifdef EDASQLite
783830
$(call cp,$(OBJBINDIR)$(LP)EDASQLite$(SO),"$(DESTLIBDIR)/")
831+
ifdef EDA_STATIC
832+
$(call cp,$(OBJLIBDIR)libEDASQLiteStatic$(A),"$(DESTSLIBDIR)/")
833+
endif
784834
endif
785835
ifdef EDASQLiteCipher
786836
$(call cp,$(OBJBINDIR)$(LP)EDASQLiteCipher$(SO),"$(DESTLIBDIR)/")
@@ -801,6 +851,9 @@ ifdef CodeGuard
801851
$(call cp,$(OBJBINDIR)CodeGuard$(E),"$(BINDIR)/")
802852
endif
803853
$(call cp,$(OBJLIBDIR)libecereVanilla$(A),"$(DESTSLIBDIR)/")
854+
ifdef ECERE_STATIC
855+
$(call cp,$(OBJLIBDIR)libecereStatic$(A),"$(DESTSLIBDIR)/")
856+
endif
804857
$(call cp,doc/tao.pdf,"$(DOCDIR)/Ecere Tao of Programming [work in progress].pdf") || echo "The Ecere Tao of Programming is available at http://ecere.com/tao.pdf"
805858
$(call cpr,$(DOC)/ecereCOM,"$(DOCDIR)/ecereCOM")
806859
$(call cpr,$(DOC)/ecere,"$(DOCDIR)/ecere")
@@ -813,11 +866,17 @@ ifdef OSX_TARGET
813866
install $(OBJLIBDIR)$(LP)ec$(SO) $(DESTLIBDIR)/
814867
install $(OBJLIBDIR)$(LP)ec2$(SO) $(DESTLIBDIR)/
815868
install $(OBJLIBDIR)$(LP)EDA$(SO) $(DESTLIBDIR)/
869+
ifdef EDA_STATIC
870+
install $(OBJLIBDIR)libEDAStatic$(A) $(DESTSLIBDIR)/
871+
endif
816872
ifdef EDAdBASE
817873
install $(OBJLIBDIR)$(LP)EDAdBASE$(SO) $(DESTLIBDIR)/
818874
endif
819875
ifdef EDASQLite
820876
install $(OBJLIBDIR)$(LP)EDASQLite$(SO) $(DESTLIBDIR)/
877+
ifdef EDA_STATIC
878+
install $(OBJLIBDIR)libEDASQLiteStatic$(A) $(DESTSLIBDIR)/
879+
endif
821880
endif
822881
ifdef EDASQLiteCipher
823882
install $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO) $(DESTLIBDIR)/
@@ -837,6 +896,9 @@ ifdef CodeGuard
837896
install $(OBJBINDIR)CodeGuard$(E) $(BINDIR)/
838897
endif
839898
install $(OBJLIBDIR)libecereVanilla$(A) $(DESTSLIBDIR)/
899+
ifdef ECERE_STATIC
900+
install $(OBJLIBDIR)libecereStatic$(A) $(DESTSLIBDIR)/
901+
endif
840902
install -d $(DOCDIR)/
841903
install doc/tao.pdf $(DOCDIR)/"Ecere Tao of Programming [work in progress].pdf" >/dev/null 2>&1 || echo "The Ecere Tao of Programming is available at http://ecere.com/tao.pdf"
842904
$(call cpr,$(DOC)/ecereCOM,"$(DOCDIR)/ecereCOM")
@@ -862,11 +924,17 @@ ifdef LINUX_TARGET
862924
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ec$(SOV) $(DESTLIBDIR)/ec/$(LP)ec$(SOV)
863925
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ec2$(SOV) $(DESTLIBDIR)/ec/$(LP)ec2$(SOV)
864926
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDA$(SOV) $(DESTLIBDIR)/ec/$(LP)EDA$(SOV)
927+
ifdef EDA_STATIC
928+
install $(INSTALL_FLAGS) $(OBJLIBDIR)libEDAStatic$(A) $(DESTSLIBDIR)/ec/libEDAStatic$(A)
929+
endif
865930
ifdef EDAdBASE
866931
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDAdBASE$(SOV) $(DESTLIBDIR)/ec/$(LP)EDAdBASE$(SOV)
867932
endif
868933
ifdef EDASQLite
869934
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLite$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLite$(SOV)
935+
ifdef EDA_STATIC
936+
install $(INSTALL_FLAGS) $(OBJLIBDIR)libEDASQLiteStatic$(A) $(DESTSLIBDIR)/ec/libEDASQLiteStatic$(A)
937+
endif
870938
endif
871939
ifdef EDASQLiteCipher
872940
install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)
@@ -933,13 +1001,15 @@ endif
9331001
install $(INSTALL_FLAGS) $(OBJBINDIR)bgen$(B32_SFX)$(E) $(BINDIR)/bgen$(B32_SFX)$(E)
9341002
install $(INSTALL_FLAGS) $(OBJBINDIR)documentor$(B32_SFX)$(E) $(BINDIR)/documentor$(B32_SFX)$(E)
9351003
install $(INSTALL_FLAGS) $(OBJLIBDIR)libecereVanilla$(A) $(DESTSLIBDIR)/libecereVanilla$(A)
1004+
ifdef ECERE_STATIC
1005+
install $(INSTALL_FLAGS) $(OBJLIBDIR)libecereStatic$(A) $(DESTSLIBDIR)/libecereStatic$(A)
1006+
endif
9361007
ifndef SKIP_ADDITIONAL_FILES
9371008
ifndef BSD_HOST
9381009
install $(INSTALL_FLAGS) -m 644 share/pixmaps/ecere.png $(DESTDIR)$(prefix)/share/pixmaps/ecere.png
9391010
install $(INSTALL_FLAGS) -m 644 share/applications/ecere.desktop $(DESTDIR)$(prefix)/share/applications/ecere.desktop
9401011
endif
9411012
endif
942-
install $(INSTALL_FLAGS) $(OBJLIBDIR)libecereVanilla$(A) $(DESTSLIBDIR)/libecereVanilla$(A)
9431013
ifdef BSD_HOST
9441014
install $(INSTALL_FLAGS) -d $(DOCDIR)
9451015
endif
@@ -991,6 +1061,9 @@ uninstall:
9911061
$(call rm,"$(DESTLIBDIR)/$(LP)ec$(SO)")
9921062
$(call rm,"$(DESTLIBDIR)/$(LP)ec2$(SO)")
9931063
$(call rm,"$(DESTLIBDIR)/$(LP)EDA$(SO)")
1064+
ifdef EDA_STATIC
1065+
$(call rm,"$(DESTSLIBDIR)/libEDAStatic$(A)")
1066+
endif
9941067
ifdef LINUX_TARGET
9951068
ifdef EDAdBASE
9961069
$(call rm,"$(DESTLIBDIR)/ec/$(LP)EDAdBASE$(SO)")
@@ -1010,6 +1083,9 @@ ifdef EDAdBASE
10101083
endif
10111084
ifdef EDASQLite
10121085
$(call rm,"$(DESTLIBDIR)/$(LP)EDASQLite$(SO)")
1086+
ifdef EDA_STATIC
1087+
$(call rm,"$(DESTSLIBDIR)/libEDASQLiteStatic$(A)")
1088+
endif
10131089
endif
10141090
ifdef EDASQLiteCipher
10151091
$(call rm,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO)")
@@ -1028,6 +1104,9 @@ endif
10281104
$(call rm,"$(BINDIR)/documentor$(B32_SFX)$(E)")
10291105
ifdef CodeGuard
10301106
$(call rm,"$(BINDIR)/CodeGuard$(E)")
1107+
endif
1108+
ifdef ECERE_STATIC
1109+
$(call rm,"$(DESTSLIBDIR)/libecereStatic$(A)")
10311110
endif
10321111
$(call rm,"$(DESTSLIBDIR)/libecereVanilla$(A)")
10331112
$(call rm,"$(DOCDIR)/Ecere Tao of Programming [work in progress].pdf")

‎deps/libffi-3.4.4/ffi.epj

+9
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
"i686-w64-mingw32"
1919
]
2020
}
21+
},
22+
{
23+
"Name" : "linux",
24+
"Options" : {
25+
"IncludeDirs" : [
26+
"x86_64-pc-linux-gnu",
27+
"x86_64-pc-linux-gnu/include"
28+
]
29+
}
2130
}
2231
],
2332
"Configurations" : [

0 commit comments

Comments
 (0)