diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-12-14 18:45:42 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-12-14 18:45:42 -0500 |
| commit | 651ba7fae91cb978281b922ad1a5864d3f846f78 (patch) | |
| tree | d24b306255ea2e6c3661a0ad980eba367f356101 /cpp/src | |
| parent | Better detection of CPP_COMPILER (diff) | |
| download | ice-651ba7fae91cb978281b922ad1a5864d3f846f78.tar.bz2 ice-651ba7fae91cb978281b922ad1a5864d3f846f78.tar.xz ice-651ba7fae91cb978281b922ad1a5864d3f846f78.zip | |
* It is no longer necessary to set CPP_COMPILER for any compiler
(I recommend not setting CPP_COMPILER)
* Replaced _EXPRESS CPP_COMPILER by HAS_MFC macro, set to "yes" by default
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/IcePatch2/Makefile.mak | 7 | ||||
| -rw-r--r-- | cpp/src/Makefile.mak | 2 | ||||
| -rwxr-xr-x | cpp/src/iceserviceinstall/Makefile.mak | 9 |
3 files changed, 3 insertions, 15 deletions
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index dc008732c1d..8b42e493b27 100755 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -30,12 +30,7 @@ SRCS = $(SOBJS:.obj=.cpp) \ CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \ - "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS" || \ - "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS" -LD_EXEFLAGS = /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" $(LD_EXEFLAGS) -!endif - +LD_EXEFLAGS = /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" $(LD_EXEFLAGS) !if "$(GENERATE_PDB)" == "yes" SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index 9ffdeb10bf0..5f20ae3022b 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -18,7 +18,7 @@ SUBDIRS = IceUtil\winrt \ IceStormLib\winrt \ IceGridLib\winrt -!elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" +!elseif "$(CPP_COMPILER)" == "VC90" SUBDIRS = IceUtil \ Slice \ slice2cpp \ diff --git a/cpp/src/iceserviceinstall/Makefile.mak b/cpp/src/iceserviceinstall/Makefile.mak index 8f422015259..362d56d5723 100755 --- a/cpp/src/iceserviceinstall/Makefile.mak +++ b/cpp/src/iceserviceinstall/Makefile.mak @@ -22,14 +22,7 @@ SRCS = $(OBJS:.obj=.cpp) CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LINKWITH = $(LIBS) -!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \ - "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS" || \ - "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS" -LINKWITH = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LINKWITH) -!else -EXTRA_MANIFEST = security.manifest -!endif +LINKWITH = /MANIFEST /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'" $(LIBS) !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(TOOL:.exe=.pdb) |