diff options
| author | mbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-13 23:33:31 +0000 |
|---|---|---|
| committer | mbrudka <mbrudka@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-13 23:33:31 +0000 |
| commit | 10738919e807efe2a98689d862b849ed38c8edeb (patch) | |
| tree | 627d1dcec093b94b5cc208cbe3329603f976084e | |
| parent | 688049f1944f5cafac07cf77f1e35967631e0e02 (diff) | |
| download | ATCD-10738919e807efe2a98689d862b849ed38c8edeb.tar.gz | |
ChangeLogTag: Tue Dec 14 00:09:48 2004 Marek Brudka <mbrudka@aster.pl>
| -rw-r--r-- | ACE-INSTALL.html | 6 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ace_fl.mpb | 3 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ace_gl.mpb | 3 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/ace_x11.mpb | 6 |
4 files changed, 15 insertions, 3 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index ddfcaba39f8..9b2f84831ff 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -2491,6 +2491,10 @@ libraries. To build this reactor one has to provide the following features: <code>x11</code> (X11 libraries), <code>gl</code> (OpenGl) and <code>fl</code> (Fast Light Toolkit). To build TAO support for <code>Fl</code> one should use <code>tao_flreactor</code> feature. + <strong>MS Windows:</strong> The paths to <code>fltkdll</code> and + <code>OpenGL32</code> libraries, as well as <code>fltk</code> header files + should be setup manually for succesfull compilation. Obviosuly, + <code>x11</code>switch is ignored for this platform.</li> </ul> <hr><p> @@ -2966,7 +2970,7 @@ from <EM><br> --> <!-- hhmts start --> -Last modified: Sun Dec 12 02:56:14 CET 2004 +Last modified: Tue Dec 14 00:27:09 CET 2004 <!-- hhmts end --> diff --git a/bin/MakeProjectCreator/config/ace_fl.mpb b/bin/MakeProjectCreator/config/ace_fl.mpb index 2c2b0fc17dd..2c74a5ba1f0 100644 --- a/bin/MakeProjectCreator/config/ace_fl.mpb +++ b/bin/MakeProjectCreator/config/ace_fl.mpb @@ -10,4 +10,7 @@ project : ace_x11, ace_gl { LIBS += $(PLATFORM_FL_LIBS) $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS) LDFLAGS += $(PLATFORM_FL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) } + specific(vc8,vc71,vc7,vc6) { + libs += fltkdll + } } diff --git a/bin/MakeProjectCreator/config/ace_gl.mpb b/bin/MakeProjectCreator/config/ace_gl.mpb index 48938a49e50..f2befa5e9e3 100644 --- a/bin/MakeProjectCreator/config/ace_gl.mpb +++ b/bin/MakeProjectCreator/config/ace_gl.mpb @@ -10,4 +10,7 @@ project : ace_x11 { LIBS += $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS) LDFLAGS += $(PLATFORM_GL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) } + specific(vc6,vc7,vc71,vc8) { + lit_libs += OpenGL32 + } } diff --git a/bin/MakeProjectCreator/config/ace_x11.mpb b/bin/MakeProjectCreator/config/ace_x11.mpb index 01b0e036e1f..0ad47e6f171 100644 --- a/bin/MakeProjectCreator/config/ace_x11.mpb +++ b/bin/MakeProjectCreator/config/ace_x11.mpb @@ -2,8 +2,10 @@ // ace_x11.mpb,v project { - // this feature by default is set to 1 as projects dependent on X11 has their own features - requires += x11 + specific(vc6,vc7,vc71,vc8) { + } else { + requires += x11 + } // Depends on configration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { |