diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-10-13 15:14:07 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-10-13 15:14:07 +0000 |
| commit | 8f31ab71b4d16dcb7968eebe703efed5656951b5 (patch) | |
| tree | 5af66279167dd977e9c05e592b976db05bc59ce1 /cpp | |
| parent | Add strong naming and assembly information. (diff) | |
| download | ice-8f31ab71b4d16dcb7968eebe703efed5656951b5.tar.bz2 ice-8f31ab71b4d16dcb7968eebe703efed5656951b5.tar.xz ice-8f31ab71b4d16dcb7968eebe703efed5656951b5.zip | |
Only include ThirdParty directives if THIRDPARTY_HOME set
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.bcc | 11 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/cpp/config/Make.rules.bcc b/cpp/config/Make.rules.bcc index 231c21b513f..4bd8a59f0c2 100644 --- a/cpp/config/Make.rules.bcc +++ b/cpp/config/Make.rules.bcc @@ -24,9 +24,14 @@ CXX = bcc32.exe CC = bcc32.exe LINK = ilink32.exe +PREOUT = , +PRELIB = ,, + !if "$(THIRDPARTY_HOME)" != "" CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" +LDFLAGS = -L"$(THIRDPARTY_HOME)\lib" !endif + CPPFLAGS = $(CPPFLAGS) -q -w-par -w-lvc -w-rch -vi- -tWM -c -DNO_STRICT;_NO_VCL;_RTLDLL !if "$(OPTIMIZE)" == "yes" @@ -35,9 +40,6 @@ CPPFLAGS = $(CPPFLAGS) -O2 -k- -DNDEBUG CPPFLAGS = $(CPPFLAGS) -Od -v -k -D_DEBUG !endif -!if "$(THIRDPARTY_HOME)" != "" -LDFLAGS = -L"$(THIRDPARTY_HOME)\lib" -!endif LDFLAGS = $(LDFLAGS) -L"$(libdir)" -L"$(BCB)\lib" -q -Gn -v -x LD_DLLFLAGS = $(LDFLAGS) -Gi -Tpd c0d32.obj @@ -47,3 +49,6 @@ ICE_OS_LIBS = cw32mti.lib import32.lib BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS) LIBS = ice$(LIBSUFFIX).lib $(BASELIBS) + +BZIP2_LIBS = libbz2.lib +DB_LIBS = libdb43.lib diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index a28d965dd7d..f211f490a4d 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -18,7 +18,12 @@ LINK = link.exe PREOUT = /out: PRELIBS = -CPPFLAGS = -nologo -I"$(THIRDPARTY_HOME)\include" -W3 -WX -GR -GX -FD -D_CONSOLE -DWIN32_LEAN_AND_MEAN +!if "$(THIRDPARTY_HOME)" != "" +CPPFLAGS = -I"$(THIRDPARTY_HOME)\include" +LDFLAGS = /LIBPATH:"$(THIRDPARTY_HOME)\lib" +!endif + +CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -GX -FD -D_CONSOLE -DWIN32_LEAN_AND_MEAN !if "$(STLPORT_HOME)" != "" CPPFLAGS = -I"$(STLPORT_HOME)\include\stlport" $(CPPFLAGS) @@ -30,12 +35,14 @@ CPPFLAGS = $(CPPFLAGS) -MD -O2 -DNDEBUG CPPFLAGS = $(CPPFLAGS) -MDd -Zi -Gm -GZ -Od -D_DEBUG !endif -LDFLAGS = /LIBPATH:"$(top_srcdir)\lib" /LIBPATH:"$(THIRDPARTY_HOME)\lib" /nologo /FIXED:no +LDFLAGS = $(LDFLAGS) /LIBPATH:"$(top_srcdir)\lib" /nologo /FIXED:no + !if "$(OPTIMIZE)" != "yes" LDFLAGS = $(LDFLAGS) /debug /incremental:yes !else LDFLAGS = $(LDFLAGS) /pdb:none /OPT:REF !endif + LD_DLLFLAGS = $(LDFLAGS) /dll LD_EXEFLAGS = $(LDFLAGS) |