diff options
| author | Jose <jose@zeroc.com> | 2015-04-13 16:24:52 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-04-13 16:24:52 +0200 |
| commit | 9eac965e8ccd8501084409d248db691b763ed25f (patch) | |
| tree | 69117fa9e58bd3a6bddf284c923f4fe81e87f371 /cpp/src/slice2cpp | |
| parent | Missing depend-file option in slice2freezej (diff) | |
| download | ice-9eac965e8ccd8501084409d248db691b763ed25f.tar.bz2 ice-9eac965e8ccd8501084409d248db691b763ed25f.tar.xz ice-9eac965e8ccd8501084409d248db691b763ed25f.zip | |
Remove FileUtil dependency for --depend-file
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Makefile.mak | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index ec4cf798797..63a727ad6e0 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -11,15 +11,11 @@ #include <IceUtil/CtrlCHandler.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> -#include <IceUtil/FileUtil.h> #include <Slice/Preprocessor.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> #include "Gen.h" -#include <iostream> -#include <fstream> - using namespace std; using namespace Slice; diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index c774b2ab70e..531ab86d408 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -20,7 +20,7 @@ RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. -I.. $(CPPFLAGS) +CPPFLAGS := -I. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index 91f7c77e160..94610b26905 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -18,7 +18,7 @@ OBJS = .\Gen.obj \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(NAME:.exe=.pdb) |