diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2012-11-15 16:11:15 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2012-11-15 16:11:15 -0330 |
| commit | 3d20204521108e28e5ae54515d814957a2172096 (patch) | |
| tree | fe35f0c35c66e01b7b9cee956e1508696ffebafa /cpp/src/slice2confluence | |
| parent | minor fixes (diff) | |
| download | ice-3d20204521108e28e5ae54515d814957a2172096.tar.bz2 ice-3d20204521108e28e5ae54515d814957a2172096.tar.xz ice-3d20204521108e28e5ae54515d814957a2172096.zip | |
Added .gitattributes file.
Normalize all repository line endings.
Diffstat (limited to 'cpp/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/Makefile.mak | 106 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Slice2Confluence.rc | 68 |
2 files changed, 87 insertions, 87 deletions
diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index 39fc98db511..ef08e4dcbaf 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -1,53 +1,53 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..
-
-NAME = $(top_srcdir)\bin\slice2confluence.exe
-
-TARGETS = $(NAME)
-
-OBJS = Gen.obj \
- ConfluenceOutput.obj \
- Main.obj
-
-SRCS = $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
-!endif
-
-RES_FILE = Slice2Confluence.res
-
-$(NAME): $(OBJS) Slice2Confluence.res
- $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \
- $(BASELIBS) $(RES_FILE)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
- del /q $(NAME:.exe=.*)
- del /q Slice2Confluence.res
-
-install:: all
- copy $(NAME) "$(install_bindir)"
-
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
- copy $(NAME:.exe=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+# ********************************************************************** +# +# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +top_srcdir = ..\.. + +NAME = $(top_srcdir)\bin\slice2confluence.exe + +TARGETS = $(NAME) + +OBJS = Gen.obj \ + ConfluenceOutput.obj \ + Main.obj + +SRCS = $(OBJS:.obj=.cpp) + +!include $(top_srcdir)/config/Make.rules.mak + +CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN + +!if "$(GENERATE_PDB)" == "yes" +PDBFLAGS = /pdb:$(NAME:.exe=.pdb) +!endif + +RES_FILE = Slice2Confluence.res + +$(NAME): $(OBJS) Slice2Confluence.res + $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \ + $(BASELIBS) $(RES_FILE) + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest + +clean:: + del /q $(NAME:.exe=.*) + del /q Slice2Confluence.res + +install:: all + copy $(NAME) "$(install_bindir)" + + +!if "$(GENERATE_PDB)" == "yes" + +install:: all + copy $(NAME:.exe=.pdb) "$(install_bindir)" + +!endif + +!include .depend.mak diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc index 495d935ca2d..d6050ea6b3b 100644 --- a/cpp/src/slice2confluence/Slice2Confluence.rc +++ b/cpp/src/slice2confluence/Slice2Confluence.rc @@ -1,34 +1,34 @@ -#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE VFT_APP
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904e4"
- BEGIN
- VALUE "CompanyName", "ZeroC, Inc.\0"
- VALUE "FileDescription", "Slice To Confluence Markup Translator\0"
- VALUE "FileVersion", "3.5b\0"
- VALUE "InternalName", "slice2confluence\0"
- VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0"
- VALUE "OriginalFilename", "slice2confluence.exe\0"
- VALUE "ProductName", "Ice\0"
- VALUE "ProductVersion", "3.5b\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
+#include "winver.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 3,5,51,0 + PRODUCTVERSION 3,5,51,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "ZeroC, Inc.\0" + VALUE "FileDescription", "Slice To Confluence Markup Translator\0" + VALUE "FileVersion", "3.5b\0" + VALUE "InternalName", "slice2confluence\0" + VALUE "LegalCopyright", "Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.\0" + VALUE "OriginalFilename", "slice2confluence.exe\0" + VALUE "ProductName", "Ice\0" + VALUE "ProductVersion", "3.5b\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END |