Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30532/adobe-source/adobe/test/visual
Modified Files:
Jamfile
Log Message:
These are some of Tobias Schwinger's changes to make ASL (and visual) build with the MinGW GCC compiler on Windows. More information on the effort is in https://sourceforge.net/tracker/?func=detail&atid=724218&aid=1180074&group_id=132417 .
cmath.hpp: use ADOBE_PLATFORM_WIN instead of BOOST_MSVC
eve.hpp: reorder member variable definitions to avoid initialization warnings.
future/assemblage.hpp: include boost/bind.hpp, because it is used later in the file.
source/istream.cpp: reorder member variable initialization list to avoid warnings.
test/eve_smoke/main.cpp: added a newline to the end of the file.
test/visual/Jamfile: add correct link flags for MinGW toolset, only include resource file for MSVC build.
I will commit more of Tobias changes once I've had the opportunity to test them (the changes which remain should always be in bug 1180074).
Index: Jamfile
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/Jamfile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Jamfile 10 Apr 2005 07:00:45 -0000 1.7
--- Jamfile 10 Apr 2005 08:15:16 -0000 1.8
***************
*** 10,14 ****
PLATFORM_HEADERS = headers/win resources ;
PLATFORM_SOURCE_DIR = sources/win ;
! PLATFORM_SOURCES = sources/win/metrics.cpp sources/win/event_dispatcher.cpp resources/resources.rc ;
#
# These two definitions say that we're targetting Windows XP. That
--- 10,21 ----
PLATFORM_HEADERS = headers/win resources ;
PLATFORM_SOURCE_DIR = sources/win ;
! #
! # Note that the resource script is also included in an MSVC build
! # by the project requirements section.
! #
! PLATFORM_SOURCES =
! sources/win/metrics.cpp
! sources/win/event_dispatcher.cpp
! ;
#
# These two definitions say that we're targetting Windows XP. That
***************
*** 26,30 ****
--- 33,46 ----
project adobe/visual
: requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows"
+ : requirements <toolset>mingw:<linkflags>"-lgdi32 -luser32 -lcomctl32"
: requirements <toolset>darwin:<linkflags>"-framework Carbon"
+ #
+ # Currently MSVC is the only windows compiler which Boost knows how
+ # to make generate resource files, hence the predicate for including
+ # resources.rc in the build. The correct fix for this Jammery is to
+ # tell Boost.Build about MinGW's resource compiler (obviously this
+ # will have to be added to Boost, not ASL).
+ #
+ : requirements <toolset>msvc:<source>resources/resources.rc
: requirements <include>headers <link>static
;
|
