diff options
| author | newhook <matthew.newhook@gmail.com> | 2015-04-13 13:42:37 -0230 |
|---|---|---|
| committer | newhook <matthew.newhook@gmail.com> | 2015-04-13 13:42:37 -0230 |
| commit | 0a07561c7a3ca81d1fde3b65f1c5adb8840b73c0 (patch) | |
| tree | d4ca7b231512593d326e4be5a11f517a8724caa0 /cpp | |
| parent | Missing char* conversion (diff) | |
| download | ice-0a07561c7a3ca81d1fde3b65f1c5adb8840b73c0.tar.bz2 ice-0a07561c7a3ca81d1fde3b65f1c5adb8840b73c0.tar.xz ice-0a07561c7a3ca81d1fde3b65f1c5adb8840b73c0.zip | |
Add MCPP_HOME for Windows build.
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/config/Make.rules.mak | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index a1e5c636251..c1d1f6c0619 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -37,6 +37,12 @@ prefix = C:\Ice-$(VERSION) #WINRT = yes # +# If MCPP is not installed in a standard location where the compiler +# can find it, set MCPP_HOME to the Mcpp installation directory. +# +MCPP_HOME = d:/mcpp + +# # If third party libraries are not installed in the default location # or THIRDPARTY_HOME is not set in your environment variables then # change the following setting to reflect the installation location. @@ -164,7 +170,12 @@ SSL_OS_LIBS = advapi32.lib secur32.lib crypt32.lib ws2_32.lib BZIP2_LIBS = libbz2$(LIBSUFFIX).lib DB_LIBS = libdb53$(LIBSUFFIX).lib +!if "$(MCPP_HOME)" != "" +MCPP_LIBS = $(MCPP_HOME)/mcpp$(LIBSUFFIX).lib +!else MCPP_LIBS = mcpp$(LIBSUFFIX).lib +!endif + EXPAT_LIBS = libexpat.lib !endif |