diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-10 18:52:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-10 18:52:48 +0000 |
| commit | 983c684fa09456764111acee2b4d85abb33ffa1a (patch) | |
| tree | c29c092d0ea4c637b39424e741ccf6c64960c069 /include | |
| parent | 9fe68ba2160a19ca31eedbc3f979b5219dc3389f (diff) | |
| download | ATCD-983c684fa09456764111acee2b4d85abb33ffa1a.tar.gz | |
ChangeLogTag: Mon Feb 10 18:48:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 3 | ||||
| -rw-r--r-- | include/makeinclude/build_dll.bor | 4 | ||||
| -rw-r--r-- | include/makeinclude/build_exe.bor | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 7114ac7cbfb..533b2f9b98a 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -17,6 +17,9 @@ DLL_NAME=dll !ifdef SSL_ROOT SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1 !endif +!ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)\TAO +!endif ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) ACE_XML_CFLAGS = -I$(ACE_ROOT) -DACEXML_HAS_DLL=$(DLL_FLAG) ACE_XML_PARSER_CFLAGS = -I$(ACE_ROOT) -DACEXML_PARSER_HAS_DLL=$(DLL_FLAG) diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor index 151668abb0d..dd4ed2ab3d7 100644 --- a/include/makeinclude/build_dll.bor +++ b/include/makeinclude/build_dll.bor @@ -50,9 +50,9 @@ $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! $(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) + - $(DLL_STARTUP_OBJ) $(OBJFILES), + + $(DLL_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + $(TARGET),, + - $(COMMON_LIBS) $(LIBFILES),, + + $(COMMON_LIBS),, + $(RESOURCE) ! !ifndef DEBUG diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor index 09f2f0d569d..3153a38b6e5 100644 --- a/include/makeinclude/build_exe.bor +++ b/include/makeinclude/build_exe.bor @@ -46,9 +46,9 @@ $(TARGET): $(OBJFILES) $(RESOURCE) @$(MAKE_BINDIR) $(LD) @&&! $(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) + - $(EXE_STARTUP_OBJ) $(OBJFILES), + + $(EXE_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + $(TARGET),, + - $(COMMON_LIBS) $(LIBFILES),, + + $(COMMON_LIBS),, + $(RESOURCE) ! !ifndef DEBUG |