summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2017-01-21 19:57:01 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2017-01-21 19:57:01 +0100
commit9fb79f76e3384a76ca193cd6bae9754eb474689e (patch)
tree19036993e0fd9fd6cc49f8b172da6ebae7cc414a
parent98fcf580138858cb1ee0dbe8ff5722849d58d697 (diff)
Revert "Test fix for rcgen compilation on FreeBSD."
This reverts commit 98fcf580138858cb1ee0dbe8ff5722849d58d697.
-rw-r--r--plugin/Makefile.mingw32.in2
-rw-r--r--plugingui/Makefile.am2
-rw-r--r--plugingui/rcgen.cc (renamed from plugingui/rcgen_.cc)0
3 files changed, 2 insertions, 2 deletions
diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in
index b84c890..575a8a2 100644
--- a/plugin/Makefile.mingw32.in
+++ b/plugin/Makefile.mingw32.in
@@ -118,7 +118,7 @@ SRC = \
drumgizmo_plugin.cc
all:
- g++ @top_srcdir@/plugingui/rcgen_.cc -o @top_srcdir@/plugingui/rcgen
+ g++ @top_srcdir@/plugingui/rcgen.cc -o @top_srcdir@/plugingui/rcgen
(cd @top_srcdir@/plugingui/resources; ../rcgen * > ../resource_data.cc)
gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c
gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index 06e936f..49025c7 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -18,7 +18,7 @@ plugingui_SOURCES = \
$(top_srcdir)/src/semaphore.cc \
$(top_srcdir)/src/mutex.cc
-rcgen_SOURCES = rcgen_.cc
+rcgen_SOURCES = rcgen.cc
EXTRA_DIST = \
button.h \
diff --git a/plugingui/rcgen_.cc b/plugingui/rcgen.cc
index 5eb3a4c..5eb3a4c 100644
--- a/plugingui/rcgen_.cc
+++ b/plugingui/rcgen.cc