[rtems-graphics-toolkit commit] Some test examples. Probably others work too
Gedare Bloom
gedare at rtems.org
Tue Dec 24 15:24:06 UTC 2013
Module: rtems-graphics-toolkit
Branch: master
Commit: 0904354cac0ea3804eefbcea1a8666c82dc1494f
Changeset: http://git.rtems.org/rtems-graphics-toolkit/commit/?id=0904354cac0ea3804eefbcea1a8666c82dc1494f
Author: Alexandru-Sever Horin <alex.sever.h at gmail.com>
Date: Wed Jul 11 03:33:29 2012 +0300
Some test examples. Probably others work too
---
fltk-1.3.0/test/Makefile | 12 ++++++++----
fltk-1.3.0/test/blocks.cxx | 3 +--
fltk-1.3.0/test/browser.cxx | 2 +-
fltk-1.3.0/test/help.cxx | 4 ++--
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/fltk-1.3.0/test/Makefile b/fltk-1.3.0/test/Makefile
index cc99346..04d4a93 100644
--- a/fltk-1.3.0/test/Makefile
+++ b/fltk-1.3.0/test/Makefile
@@ -31,6 +31,8 @@ include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
include $(RTEMS_CUSTOM)
include $(PROJECT_ROOT)/make/leaf.cfg
+LDLIBS+= ../../microwin/src/obj/rtems_init.o ../../microwin/src/obj/FilesystemImage.o
+
CPPFILES =\
unittests.cxx \
adjuster.cxx \
@@ -298,6 +300,8 @@ bitmap$(EXEEXT): bitmap.o
boxtype$(EXEEXT): boxtype.o
browser$(EXEEXT): browser.o
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ browser.o $(LINKFLTKFORMS) $(LDLIBS)
+
button$(EXEEXT): button.o
@@ -327,7 +331,7 @@ curve$(EXEEXT): curve.o
demo$(EXEEXT): demo.o
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS) ../../microwin/src/obj/rtems_init.o ../../microwin/src/obj/FilesystemImage.o
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
device$(EXEEXT): device.o $(IMGLIBNAME)
echo Linking $@...
@@ -337,7 +341,7 @@ doublebuffer$(EXEEXT): doublebuffer.o
editor$(EXEEXT): editor.o
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
fast_slow$(EXEEXT): fast_slow.o
fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT)
@@ -353,11 +357,11 @@ forms$(EXEEXT): forms.o
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ forms.o $(LINKFLTKFORMS) $(LDLIBS)
hello$(EXEEXT): hello.o
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ hello.o $(LINKFLTKFORMS) $(LDLIBS) ../../microwin/src/obj/rtems_init.o ../../microwin/src/obj/FilesystemImage.o
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ hello.o $(LINKFLTKFORMS) $(LDLIBS)
help$(EXEEXT): help.o $(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
iconize$(EXEEXT): iconize.o
diff --git a/fltk-1.3.0/test/blocks.cxx b/fltk-1.3.0/test/blocks.cxx
index f3eef86..af293d1 100644
--- a/fltk-1.3.0/test/blocks.cxx
+++ b/fltk-1.3.0/test/blocks.cxx
@@ -494,8 +494,7 @@ class BlockWindow : public Fl_Double_Window
Fl_Preferences BlockWindow::prefs_(Fl_Preferences::USER, "fltk.org", "blocks");
-int
-main(int argc, char *argv[]) {
+extern "C" int rtems_main(int argc, char *argv[]) {
Fl::scheme("plastic");
Fl::visible_focus(0);
diff --git a/fltk-1.3.0/test/browser.cxx b/fltk-1.3.0/test/browser.cxx
index 26a8444..7142171 100644
--- a/fltk-1.3.0/test/browser.cxx
+++ b/fltk-1.3.0/test/browser.cxx
@@ -122,7 +122,7 @@ void sort_cb(Fl_Widget *, void *) {
browser->sort(FL_SORT_ASCENDING);
}
-int main(int argc, char **argv) {
+extern "C" int rtems_main(int argc, char **argv) {
int i;
if (!Fl::args(argc,argv,i)) Fl::fatal(Fl::help);
const char* fname = (i < argc) ? argv[i] : "browser.cxx";
diff --git a/fltk-1.3.0/test/help.cxx b/fltk-1.3.0/test/help.cxx
index b2493e7..0c58b90 100644
--- a/fltk-1.3.0/test/help.cxx
+++ b/fltk-1.3.0/test/help.cxx
@@ -59,8 +59,8 @@ void set_app_dir() {
// 'main()' - Display the help GUI...
//
-int // O - Exit status
-main(int argc, // I - Number of command-line arguments
+ // O - Exit status
+extern "C" int rtems_main(int argc, // I - Number of command-line arguments
char *argv[]) // I - Command-line arguments
{
Fl_Help_Dialog *help; // Help dialog
More information about the vc
mailing list