diff options
author | Philipp Lohmann <pl@openoffice.org> | 2008-01-10 18:42:35 +0000 |
---|---|---|
committer | Philipp Lohmann <pl@openoffice.org> | 2008-01-10 18:42:35 +0000 |
commit | c8861607f75b9552a7695bf5b11f163f4b1ec527 (patch) | |
tree | 41ed39f88930106a0c0e62c1c002278eef57f709 /icc | |
parent | a898a5243cd1e1ca5cd525a8f39d9edffc12acc0 (diff) |
#i81093# make windows version work on 4nt shell
Diffstat (limited to 'icc')
-rw-r--r-- | icc/makefile.mk | 9 | ||||
-rw-r--r-- | icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/icc/makefile.mk b/icc/makefile.mk index 83db4115a88d..34c7375aff6b 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: pl $ $Date: 2008-01-10 15:38:31 $ +# last change: $Author: pl $ $Date: 2008-01-10 19:42:35 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,12 @@ CONVERTFILES= \ Contrib/ICC_utils/Vetters.cpp .IF "$(GUI)"=="WNT" +.IF "$(USE_SHELL)"=="4nt" +CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)../source/create_sRGB_profile Contrib/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip +BUILD_ACTION=dmake && cd Contrib/CmdLine/create_sRGB_profile && ./create_sRGB_profile +.ELSE CONFIGURE_ACTION= $(COPY) -r $(BACK_PATH)../source/create_sRGB_profile Contrib/CmdLine && CC="" CXX="" ./configure +.ENDIF .ELSE CONFIGURE_ACTION= $(COPY) -r $(BACK_PATH)../source/create_sRGB_profile Contrib/CmdLine && ./configure .ENDIF diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp index 61ef0c617a7e..5e4e93da3400 100644 --- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp +++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp @@ -4,9 +4,9 @@ * * $RCSfile: create_sRGB_profile.cpp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pl $ $Date: 2008-01-10 16:17:14 $ + * last change: $Author: pl $ $Date: 2008-01-10 19:41:56 $ Derived by beppec56@openoffice.org from various examples in SampleICC library, the original copyright retained. @@ -481,7 +481,7 @@ int main(int argc, char* argv[]) // Out it goes CIccFileIO out; - out.Open(out_file_pathname, "w+"); + out.Open(out_file_pathname, "wb+"); profile.Write(&out); out.Close(); @@ -511,7 +511,7 @@ int main(int argc, char* argv[]) int achar, number = 1; - infile = fopen(out_file_pathname,"r"); + infile = fopen(out_file_pathname,"rb"); fseek(infile,0,SEEK_END); long int thesize= ftell(infile); |