From 2d129502354da4fe39dac13463ea742f8026ab91 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 3 Jan 2023 22:15:09 +0100 Subject: [PATCH] Link libs and fix jnetlib. --- WDL/eel2/Makefile | 2 +- WDL/jnetlib/Makefile | 2 +- WDL/swell/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WDL/eel2/Makefile b/WDL/eel2/Makefile index ac2e41f1..0ffca97a 100644 --- a/WDL/eel2/Makefile +++ b/WDL/eel2/Makefile @@ -153,7 +153,7 @@ gen-lex: # the output of this, lex.nseel.c, is unused because we have a handwri $(CXX) $(CXXFLAGS) -c -o $@ $^ loose_eel: loose_eel.o $(OBJS) $(OBJS2) - g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) + g++ -o $@ $^ $(CXXFLAGS) $(LFLAGS) -lGL clean: -rm -f -- loose_eel loose_eel.o $(OBJS) diff --git a/WDL/jnetlib/Makefile b/WDL/jnetlib/Makefile index 10d9fe8a..85570c5a 100644 --- a/WDL/jnetlib/Makefile +++ b/WDL/jnetlib/Makefile @@ -7,7 +7,7 @@ CC = gcc CPP = g++ CXX = g++ -OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o sercon.o +OBJS = asyncdns.o connection.o httpget.o httpserv.o listen.o util.o jnl.a: ${OBJS} -rm -f jnl.a diff --git a/WDL/swell/Makefile b/WDL/swell/Makefile index 9e7e2d87..8e98a543 100644 --- a/WDL/swell/Makefile +++ b/WDL/swell/Makefile @@ -167,7 +167,7 @@ libSwell$(DLL_EXT): $(OBJS) $(CXX) -shared -o $@ $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) test: $(OBJS) test.o - $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) + $(CXX) -o test $(CFLAGS) $(LFLAGS) $^ $(LINKEXTRA) -lpthread -ldl $(shell $(PKG_CONFIG) --libs gtk+-3.0 freetype2) -lfontconfig -lGL -lXi -lX11 libSwell.colortheme: swell-gdi-generic.cpp $(SWELL_HEADERS) $(CXX) $(CFLAGS) -o make-theme -DSWELL__MAKE_THEME swell-gdi-generic.cpp -lpthread -- 2.38.1
path: root/.gitignore
AgeCommit message (Collapse)Author
2020-10-20gitignore: Ignore generated guile binary and intermediate products.Julien Lepiller
* .gitignore: Ignore guile, guile-guile-launcher.o, .deps and .dirstamp.
2020-09-17guix-install.sh: Support OpenRC.Morgan Smith
* etc/guix-install.sh (chk_init_sys): Detect OpenRC. (sys_enable_guix_daemon): Install & enable the Guix daemon on such systems. * etc/openrc/guix-daemon.in: New file. * nix/local.mk: Add a rule for it. (openrcservicedir, nodist_openrcservice_DATA): New variables. (CLEANFILES, EXTRA_DIST): Add them. * .gitignore: Ignore etc/openrc/guix-daemon. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
2020-07-17gitignore: Don't ignore daemon source code.Jakub Kądziołka
Remove files that are included in the repository from .gitignore. This improves the behavior of some code-searching tools.
2020-06-28.gitignore: Ignore 'etc/committer.scm'.Brice Waegeneire
* .gitignore: Add '/etc/committer.scm'.
2020-05-16etc: Add a systemd unit to bind-mount @storedir@ read-only.Tobias Geerinckx-Rice
* etc/gnu-store.mount.in: New file. * nix/local.mk (nodist_systemdservice_DATA): Add it. (etc/%.mount): New rule for it. * etc/guix-install.sh (sys_enable_guix_daemon): Install it. * doc/guix.texi (Binary Installation): Document it. * .gitignore: Ignore changes to it.
2020-05-14etc: indent-code.el: Use the --quick option.Maxim Cournoyer
This prevents Emacs from loading the autoload definitions found in its profile, which needlessly clutters the output. It also prevents Geiser (if installed) from blocking the script and asking the user to input the Scheme implementation to use. The trick for passing multiple arguments to Emacs is to use what is called a "sesquicolon" (see https://www.emacswiki.org/emacs/EmacsScripts). * etc/indent-code.el.in: Rename to... * etc/indent-code.el: ...this. Adapt the shebang to use a sesquicolon, and pass the --quick option to Emacs. Since this line is interpreted by the shell, simply use Emacs from the PATH instead of from a hard coded location. (main): New procedure, used as the entry point. * configure.ac: Remove the warning about Emacs. Emacs can now be installed any time by the user if they want to use the script. * .gitignore: No longer ignore changes to etc/indent-code.el.