diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-10-18 13:08:41 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-10-18 13:08:41 +0000 |
| commit | 529d429a1fe46422fb26a0363b1df09e99bf0688 (patch) | |
| tree | f2f07c87a80f7cb04eb236a33272522aa001ac1d | |
| parent | adding book demos (diff) | |
| download | ice-529d429a1fe46422fb26a0363b1df09e99bf0688.tar.bz2 ice-529d429a1fe46422fb26a0363b1df09e99bf0688.tar.xz ice-529d429a1fe46422fb26a0363b1df09e99bf0688.zip | |
Changed STLPORT_HOME to USE_STLPORT
| -rw-r--r-- | cpp/config/Make.rules.mak | 7 | ||||
| -rwxr-xr-x | cpp/config/Make.rules.msvc | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index c5d5e635df6..e6352c6038c 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -19,7 +19,6 @@ prefix = C:\Ice-$(VERSION) #
#OPTIMIZE = yes
-
#
# Borland C++Builder 2006 home directory. Define if building with
# C++ Builder. Change if different from default.
@@ -33,9 +32,11 @@ prefix = C:\Ice-$(VERSION) THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty
#
-# Define if using STLPort. Required if using MSVC++ 6.0.
+# Define USE_STLPORT if using STLPort. Required if using MSVC++ 6.0.
+# STLPort must be installed in the same directory as the other third
+# party libraries.
#
-#STLPORT_HOME = $(THIRDPARTY_HOME)
+#USE_STLPORT = yes
# ----------------------------------------------------------------------
# Don't change anything below this line!
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index f211f490a4d..3982ba960a2 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -21,14 +21,15 @@ PRELIBS = !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 "$(USE_STLPORT)" != "" +CPPFLAGS = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS) +!endif -!if "$(STLPORT_HOME)" != "" -CPPFLAGS = -I"$(STLPORT_HOME)\include\stlport" $(CPPFLAGS) !endif +CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -GX -FD -D_CONSOLE -DWIN32_LEAN_AND_MEAN + !if "$(OPTIMIZE)" == "yes" CPPFLAGS = $(CPPFLAGS) -MD -O2 -DNDEBUG !else |