diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-17 13:15:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-17 13:15:18 +0000 |
| commit | 7008add4bd09e7f3057a0deca5adebde0ebe3e0a (patch) | |
| tree | 0a28586f6b2899a71f7f07bbb5cae518eb0b5086 | |
| parent | c3aedcb953b959be0ba6da50bc67f21465410be3 (diff) | |
| download | ATCD-7008add4bd09e7f3057a0deca5adebde0ebe3e0a.tar.gz | |
ChangeLogTag: Thu Nov 16 12:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/examples/Borland/ChatClient.mpc | 17 | ||||
| -rw-r--r-- | TAO/examples/Borland/README | 8 | ||||
| -rw-r--r-- | include/makeinclude/build_exe.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/compiler.bor | 14 |
4 files changed, 36 insertions, 5 deletions
diff --git a/TAO/examples/Borland/ChatClient.mpc b/TAO/examples/Borland/ChatClient.mpc new file mode 100644 index 00000000000..cb44c0bd968 --- /dev/null +++ b/TAO/examples/Borland/ChatClient.mpc @@ -0,0 +1,17 @@ +// -*- MPC -*- +// $Id$ + +project(*Client) : taoserver, utils, iortable, vcl { + exename = chatclient + IDL_Files { + Broadcaster.idl + Receiver.idl + } + Source_Files { + ReceiverImpl.cpp + ChatClient.cpp + ORBThread.cpp + ChatClientWnd.cpp + } +} + diff --git a/TAO/examples/Borland/README b/TAO/examples/Borland/README index 5e81dd95a76..cd83337e526 100644 --- a/TAO/examples/Borland/README +++ b/TAO/examples/Borland/README @@ -3,12 +3,12 @@ $Id$ Before compiling the example in The Borland C++ Builder IDE you must generate the client and server stubs using build_idl.bat. Please update the location of the tao_idl dependent on your build -configuration. The default location is for a BCB4 Dynamic Debug -Pascal configuration. +configuration. The default location is for a BCB6 Dynamic Debug +configuration. In the project file you must also update the names of the ACE and -TAO libraries that you use. The configured names are for the BCB4 -Dynamic Debug Pascal configuration. +TAO libraries that you use. The configured names are for the BCB6 +Dynamic Debug configuration. This directory illustrates how to write a Borland C++ Builder application using ACE+TAO. Please contact Jody Hagins diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor index 917bd511de8..3387e6e5cf5 100644 --- a/include/makeinclude/build_exe.bor +++ b/include/makeinclude/build_exe.bor @@ -43,7 +43,7 @@ $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! $(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) + - $(EXE_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + + $(EXE_STARTUP_OBJ) $(PACKAGES) $(LIBFILES) $(OBJFILES), + $(TARGET),, + $(COMMON_LIBS),, + $(RESOURCE) diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor index 87a3edcc96e..25ed0158f20 100644 --- a/include/makeinclude/compiler.bor +++ b/include/makeinclude/compiler.bor @@ -139,6 +139,12 @@ COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \ COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn -L$(BCB)\lib -L$(BCB)\lib\psdk +!ifdef VCL +PACKAGES = rtl.bpi vcl.bpi vclx.bpi vcljpg.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi \ + vcldb.bpi bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi \ + nmfast.bpi dclocx.bpi +!endif + # # DLL specific flags # @@ -158,10 +164,18 @@ DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT) EXE_CFLAGS = EXE_LFLAGS = -Tpe !ifdef UNICODE +!ifdef VCL +EXE_STARTUP_OBJ = c0w32w.$(OBJ_EXT) +!else EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT) +!endif +!else +!ifdef VCL +EXE_STARTUP_OBJ = c0w32.$(OBJ_EXT) !else EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT) !endif +!endif # # Static lib specific flags |