Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28424/adobe-source/adobe/test/visual
Modified Files:
Jamfile
Log Message:
Restructures this Jamfile from gound up (tested on Windows with MSVC 7.1 and GCC, so far)
Index: Jamfile
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/Jamfile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Jamfile 16 Apr 2005 00:02:44 -0000 1.11
--- Jamfile 20 Apr 2005 08:14:51 -0000 1.12
***************
*** 1,65 ****
# Jamfile for building the VISUAL demo
import testing ;
import os ;
#
! # We need to include different directories for Windows vs. Mac.
#
! if [ os.name ] = NT
{
! 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
! # means that we get various preprocessor definitions which we need,
! # such as the WS_EX_COMPOSITED window style.
#
! PLATFORM_DEFINITIONS = <define>WINVER=0x501 <define>_WIN32_WINNT=0x501 <define>_WIN32_IE=0x0501 ;
! } else {
! PLATFORM_HEADERS = headers/mac ;
! PLATFORM_SOURCE_DIR = sources/mac ;
! PLATFORM_SOURCES = ;
! PLATFORM_DEFINITIONS = ;
! }
- project adobe/visual
- : requirements <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib /subsystem:windows"
#
! # REVISIT (t_schwinger):
#
! # Masking darwin by requesting the GNU linker is odd. This has to be straightened out
! # as soon as there are more GCC platforms...
#
! : requirements <toolset>gcc:<linker>gnu:<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
! ;
- exe "visual"
- : sources/express_viewer.cpp
- sources/client_assembler.cpp
- sources/ui_core.cpp
- sources/ui_core_common.cpp
- $(PLATFORM_SOURCES)
- $(PLATFORM_SOURCE_DIR)/main.cpp
- $(PLATFORM_SOURCE_DIR)/display.cpp
- $(PLATFORM_SOURCE_DIR)/ui_core_implementation.cpp
- /adobe//asl_lib_dev
- /boost/filesystem//boost_filesystem
- : <include>$(PLATFORM_HEADERS) $(PLATFORM_DEFINITIONS) <link>static ;
--- 1,112 ----
# Jamfile for building the VISUAL demo
+
import testing ;
import os ;
+ project adobe/visual
+ : requirements <user-interface>gui
+ : requirements <library>/adobe//asl_lib_dev
+ : requirements <library>/boost/filesystem//boost_filesystem
+ : requirements <link>static
+ ;
+
+ SOURCE_DIRECTORY = sources ;
+ HEADER_DIRECTORY = headers ;
+
#
! # Sources (common to all platforms)
#
! COMMON_SOURCES =
! express_viewer
! client_assembler
! ui_core
! ui_core_common
! ;
!
! #
! # Platform specific sources (which exist for every platform)
! #
! BRIDGE_SOURCES =
! main
! display
! ui_core_implementation
! ;
!
!
! switch [ os.name ]
{
! case NT : # --- Windows ---------------------------------------------------------------------------
! {
#
! # Additional sources that only exist for Windows
#
! PLATFORM_SOURCES =
! metrics
! event_dispatcher
! ;
!
#
! # Directory name for Windows specific sources and headers
#
! PLATFORM_DIRECTORIES_NAME = win ;
!
#
! # Build settings for Windows
#
! PLATFORM_SETTINGS =
! #
! # Boost.Build only knows the MSVC resource compiler (that's why the
! # resource script is added conditionally to the sources, here)
! #
! <include>resources
! <toolset>msvc:<source>resources/resources.rc
!
! #
! # These definitions say that we're targetting Windows XP.
! # That means that we get various preprocessor definitions which we
! # need, such as the WS_EX_COMPOSITED window style.
! #
! <define>WINVER=0x501 <define>_WIN32_WINNT=0x501 <define>_WIN32_IE=0x501
!
! <toolset>msvc:<linkflags>"gdi32.lib user32.lib comctl32.lib"
!
! #
! # If compiling with GCC we add -mno-cygwin to tell the cygwin compiler
! # and linker that we want a native Windows application.
! #
! <toolset>gcc:<cxxflags>"-mno-cygwin"
! <toolset>gcc:<linkflags>"-lgdi32 -luser32 -lcomctl32 -mno-cygwin"
! ;
! }
! case * : # --- Mac OS (assumed) ------------------------------------------------------------------
! {
#
! # Additional sources that only exist for MacOS
#
! PLATFORM_SOURCES = ;
!
#
! # Directory name for MacOS specific sources
! #
! PLATFORM_DIRECTORIES_NAME = mac ;
!
! #
! # Build settings for MacOS
! #
! PLATFORM_SETTINGS = <toolset>darwin:<framework>Carbon ;
! }
! }
!
! # -------------------------------------------------------------------------------------------------
!
! PLATFORM_SOURCES += $(BRIDGE_SOURCES) ;
!
! INCLUDE = <include>$(HEADER_DIRECTORY) <include>$(HEADER_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME) ;
! SOURCES =
! $(SOURCE_DIRECTORY)/$(COMMON_SOURCES).cpp
! $(SOURCE_DIRECTORY)/$(PLATFORM_DIRECTORIES_NAME)/$(PLATFORM_SOURCES).cpp
! ;
!
! exe "visual" : $(SOURCES) : $(INCLUDE) $(PLATFORM_SETTINGS) ;
|
