summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-01 17:31:11 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-01 17:31:11 +0000
commit369d564291fc24054e7d677935cb702a3aff8868 (patch)
treef8cdd18c234f45aeef288ec9c8daadfa2de72116
parentde91c4827231a40828a394c5d4d633e20eb41aa3 (diff)
downloadATCD-369d564291fc24054e7d677935cb702a3aff8868.tar.gz
ChangeLogTag:Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--ChangeLog21
-rw-r--r--ChangeLogs/ChangeLog-02a21
-rw-r--r--ChangeLogs/ChangeLog-03a21
-rw-r--r--include/makeinclude/platform_linux.GNU10
4 files changed, 46 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 6627c676a33..4a4ffe749db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * include/makeinclude/platform_linux.GNU:
+ Add support for wxWindows under linux.
+
Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu>
- * include/makeinclude/ace_flags.bor:
+ * include/makeinclude/ace_flags.bor:
- Added definitions necessary for the new smart proxies
- library and its Borland makefile.
+ Added definitions necessary for the new smart proxies
+ library and its Borland makefile.
Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com>
@@ -15,11 +20,11 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu>
Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu>
- * apps/drwho/server.cpp:
- * apps/drwho/BS_Client.cpp:
- Used casts to quiet VxWorks/LynxOS.
- * bin/auto_run_tests.lst:
- Commented out this test - its broken.
+ * apps/drwho/server.cpp:
+ * apps/drwho/BS_Client.cpp:
+ Used casts to quiet VxWorks/LynxOS.
+ * bin/auto_run_tests.lst:
+ Commented out this test - its broken.
Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Reactor/Multicast/*.bor
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6627c676a33..4a4ffe749db 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,9 +1,14 @@
+Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * include/makeinclude/platform_linux.GNU:
+ Add support for wxWindows under linux.
+
Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu>
- * include/makeinclude/ace_flags.bor:
+ * include/makeinclude/ace_flags.bor:
- Added definitions necessary for the new smart proxies
- library and its Borland makefile.
+ Added definitions necessary for the new smart proxies
+ library and its Borland makefile.
Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com>
@@ -15,11 +20,11 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu>
Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu>
- * apps/drwho/server.cpp:
- * apps/drwho/BS_Client.cpp:
- Used casts to quiet VxWorks/LynxOS.
- * bin/auto_run_tests.lst:
- Commented out this test - its broken.
+ * apps/drwho/server.cpp:
+ * apps/drwho/BS_Client.cpp:
+ Used casts to quiet VxWorks/LynxOS.
+ * bin/auto_run_tests.lst:
+ Commented out this test - its broken.
Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Reactor/Multicast/*.bor
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6627c676a33..4a4ffe749db 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,9 +1,14 @@
+Fri Dec 1 09:30:08 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * include/makeinclude/platform_linux.GNU:
+ Add support for wxWindows under linux.
+
Fri Dec 1 10:56:42 2000 Jeff Parsons <parsons@cs.wustl.edu>
- * include/makeinclude/ace_flags.bor:
+ * include/makeinclude/ace_flags.bor:
- Added definitions necessary for the new smart proxies
- library and its Borland makefile.
+ Added definitions necessary for the new smart proxies
+ library and its Borland makefile.
Fri Dec 01 09:21:31 2000 Steve Huston <shuston@riverace.com>
@@ -15,11 +20,11 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu>
Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu>
- * apps/drwho/server.cpp:
- * apps/drwho/BS_Client.cpp:
- Used casts to quiet VxWorks/LynxOS.
- * bin/auto_run_tests.lst:
- Commented out this test - its broken.
+ * apps/drwho/server.cpp:
+ * apps/drwho/BS_Client.cpp:
+ Used casts to quiet VxWorks/LynxOS.
+ * bin/auto_run_tests.lst:
+ Commented out this test - its broken.
Wed Nov 29 09:41:51 2000 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Reactor/Multicast/*.bor
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index ddefa488eb9..f0b5ca8dd39 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -35,13 +35,17 @@ PLATFORM_X11_LIBS=-lX11
PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include
-PLATFORM_GL_LIBS=-lGL
-PLATFORM_GL_LDFLAGS=-L/usr/X11R6/lib
+PLATFORM_GL_LIBS =-lGL
+PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib
PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
-PLATFORM_GTK_LIBS=$(shell gtk-config --libs)
+PLATFORM_GTK_LIBS =$(shell gtk-config --libs)
PLATFORM_GTK_LDFLAGS=
+PLATFORM_WX_CPPFLAGS= $(shell wx-config --cflags) $(PLATFORM_GTK_CPPFLAGS)
+PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS)
+PLATFORM_WX_LDFLAGS =
+
PLATFORM_AIO_SUPPORT := \
$(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)