diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-31 11:50:59 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-31 11:50:59 +0100 |
| commit | 1d5de2660924b5bf1e1d00a51d6c02aa8bdee382 (patch) | |
| tree | 14e0b63a49b4616980b9d488508d4bc8b1ce442f /cpp/src/slice2rb | |
| parent | Minor fix to demoscript/Util.py spawn. (diff) | |
| download | ice-1d5de2660924b5bf1e1d00a51d6c02aa8bdee382.tar.bz2 ice-1d5de2660924b5bf1e1d00a51d6c02aa8bdee382.tar.xz ice-1d5de2660924b5bf1e1d00a51d6c02aa8bdee382.zip | |
- Fixed bug 4521: it's now possible to build the tests & demos against
C:\Program Files\ZeroC\Ice-3.4b. To support this, new .depend.mak
files were added.
- Fixed nmake install to support installing Ice in C:\Program Files.
- Fixed bug 4569: test/IceUtil/inputUtil VC6 compilation failure.
- Updated all dependencies.
- Fixed C# slice2cs compiler options for all C# demo makefiles (no need
for --ice or extra -I options)
- Fixed nmake install for 64 bits build of Ice for Python (we now correctly
install IcePy in the x64 subdir).
- Demos and tests builds will now look for Ice in
C:\Program Files\ZeroC\Ice-3.4b by default is ICE_HOME isn't set (or
C:\Program Files (x86)\ZeroC\Ice-3.4b)
Diffstat (limited to 'cpp/src/slice2rb')
| -rw-r--r-- | cpp/src/slice2rb/.depend.mak | 1 | ||||
| -rw-r--r-- | cpp/src/slice2rb/Makefile.mak | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/slice2rb/.depend.mak b/cpp/src/slice2rb/.depend.mak new file mode 100644 index 00000000000..ab6dca6a966 --- /dev/null +++ b/cpp/src/slice2rb/.depend.mak @@ -0,0 +1 @@ +Main$(OBJEXT): Main.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/IceUtil/Options.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/Slice/Preprocessor.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/Slice/Parser.h" "$(includedir)/Slice/RubyUtil.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Util.h" diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index b7b887140c8..c190d7f480a 100644 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -38,13 +38,13 @@ clean:: del /q Slice2Rb.res
install:: all
- copy $(NAME) $(install_bindir)
+ copy $(NAME) "$(install_bindir)"
!if "$(GENERATE_PDB)" == "yes"
install:: all
- copy $(NAME:.exe=.pdb) $(install_bindir)
+ copy $(NAME:.exe=.pdb) "$(install_bindir)"
!endif
-!include .depend
+!include .depend.mak
|