From 1d17d59eac87eaf5095ef852045224cc77e4d8ce Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Wed, 24 Apr 2019 17:20:19 +0200 Subject: [PATCH] Compiled binaries are placed in root directory --- {src/plugins => mods}/default/main.scm | 0 src/Makefile.am | 8 ++++---- src/main.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename {src/plugins => mods}/default/main.scm (100%) diff --git a/src/plugins/default/main.scm b/mods/default/main.scm similarity index 100% rename from src/plugins/default/main.scm rename to mods/default/main.scm diff --git a/src/Makefile.am b/src/Makefile.am index 69f3129..20ec91a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = DungeonMaster -DungeonMaster_SOURCES = main.cpp -DungeonMaster_CPPFLAGS = @GUILE_CFLAGS@ -DungeonMaster_LDFLAGS = @GUILE_LIBS@ +bin_PROGRAMS = $(top_builddir)/DungeonMaster +__top_builddir__DungeonMaster_SOURCES = main.cpp +__top_builddir__DungeonMaster_CPPFLAGS = @GUILE_CFLAGS@ +__top_builddir__DungeonMaster_LDFLAGS = @GUILE_LIBS@ diff --git a/src/main.cpp b/src/main.cpp index 18007c2..9f3ad6d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ int main() { scm_init_guile(); scm_init_dungeon_master_module(); - scm_primitive_load(scm_from_locale_string("plugins/default/main.scm")); + scm_primitive_load(scm_from_locale_string("mods/default/main.scm")); IrrlichtDevice* device = createDevice(EDT_OPENGL, -- 2.39.5