projects / platform / upstream / flac.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f420524)
change .cc suffix to .cpp
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 16 Oct 2002 22:28:38 +0000 (22:28 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 16 Oct 2002 22:28:38 +0000 (22:28 +0000)
flac.pbproj/project.pbxproj patch | blob | history
src/libFLAC++/Makefile.vc patch | blob | history
src/libOggFLAC++/Makefile.vc patch | blob | history
src/test_libFLAC++/Makefile.vc patch | blob | history
src/test_libOggFLAC++/Makefile.vc patch | blob | history

diff --git a/flac.pbproj/project.pbxproj b/flac.pbproj/project.pbxproj
index 7c42437..6d4963c 100644 (file)
--- a/flac.pbproj/project.pbxproj
+++ b/flac.pbproj/project.pbxproj
@@ -1214,27 +1214,27 @@
                };
                F5CA9EDB02D186C7011525B7 = {
                        isa = PBXFileReference;
-                       path = file_decoder.cc;
+                       path = file_decoder.cpp;
                        refType = 4;
                };
                F5CA9EDC02D186C7011525B7 = {
                        isa = PBXFileReference;
-                       path = metadata.cc;
+                       path = metadata.cpp;
                        refType = 4;
                };
                F5CA9EDD02D186C7011525B7 = {
                        isa = PBXFileReference;
-                       path = seekable_stream_decoder.cc;
+                       path = seekable_stream_decoder.cpp;
                        refType = 4;
                };
                F5CA9EDE02D186C7011525B7 = {
                        isa = PBXFileReference;
-                       path = stream_decoder.cc;
+                       path = stream_decoder.cpp;
                        refType = 4;
                };
                F5CA9EDF02D186C7011525B7 = {
                        isa = PBXFileReference;
-                       path = stream_encoder.cc;
+                       path = stream_encoder.cpp;
                        refType = 4;
                };
                F5CA9EE002D186C7011525B7 = {
@@ -1353,7 +1353,7 @@
                };
                F5CA9EF302D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = decoders.cc;
+                       path = decoders.cpp;
                        refType = 4;
                };
                F5CA9EF402D1874F011525B7 = {
@@ -1363,7 +1363,7 @@
                };
                F5CA9EF502D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = encoders.cc;
+                       path = encoders.cpp;
                        refType = 4;
                };
                F5CA9EF602D1874F011525B7 = {
@@ -1383,12 +1383,12 @@
                };
                F5CA9EF902D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = main.cc;
+                       path = main.cpp;
                        refType = 4;
                };
                F5CA9EFA02D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = metadata.cc;
+                       path = metadata.cpp;
                        refType = 4;
                };
                F5CA9EFB02D1874F011525B7 = {
@@ -1398,12 +1398,12 @@
                };
                F5CA9EFC02D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = metadata_manip.cc;
+                       path = metadata_manip.cpp;
                        refType = 4;
                };
                F5CA9EFD02D1874F011525B7 = {
                        isa = PBXFileReference;
-                       path = metadata_object.cc;
+                       path = metadata_object.cpp;
                        refType = 4;
                };
                F5CA9EFE02D1874F011525B7 = {
diff --git a/src/libFLAC++/Makefile.vc b/src/libFLAC++/Makefile.vc
index 5303616..8c9fd68 100644 (file)
--- a/src/libFLAC++/Makefile.vc
+++ b/src/libFLAC++/Makefile.vc
@@ -18,48 +18,32 @@
 \r
 !include <win32.mak>\r
 \r
-SUFFIXES = .cc\r
+SUFFIXES = .cpp\r
 \r
 !IFDEF DEBUG\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
-CC_FILES= \\r
-       file_decoder.cc \\r
-       file_encoder.cc \\r
-       metadata.cc \\r
-       seekable_stream_decoder.cc \\r
-       seekable_stream_encoder.cc \\r
-       stream_decoder.cc \\r
-       stream_encoder.cc\r
+CPP_FILES= \\r
+       file_decoder.cpp \\r
+       file_encoder.cpp \\r
+       metadata.cpp \\r
+       seekable_stream_decoder.cpp \\r
+       seekable_stream_encoder.cpp \\r
+       stream_decoder.cpp \\r
+       stream_encoder.cpp\r
 \r
-OBJS= $(CC_FILES:.cc=.obj)\r
+OBJS= $(CPP_FILES:.cpp=.obj)\r
 \r
 all: libFLAC++.lib\r
 \r
 libFLAC++.lib: $(OBJS)\r
        link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS)\r
 \r
-# can't figure out how to get it to take .cc so we just hack it for now:\r
-file_decoder.obj: file_decoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP file_decoder.cc\r
-file_encoder.obj: file_encoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP file_encoder.cc\r
-metadata.obj: metadata.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata.cc\r
-seekable_stream_decoder.obj: seekable_stream_decoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP seekable_stream_decoder.cc\r
-seekable_stream_encoder.obj: seekable_stream_encoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP seekable_stream_encoder.cc\r
-stream_decoder.obj: stream_decoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_decoder.cc\r
-stream_encoder.obj: stream_encoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_encoder.cc\r
-\r
 clean:\r
        -del *.obj *.pch\r
        -del ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC++.pdb\r
diff --git a/src/libOggFLAC++/Makefile.vc b/src/libOggFLAC++/Makefile.vc
index 1383fcb..42f5aa5 100644 (file)
--- a/src/libOggFLAC++/Makefile.vc
+++ b/src/libOggFLAC++/Makefile.vc
@@ -18,33 +18,27 @@
 \r
 !include <win32.mak>\r
 \r
-SUFFIXES = .cc\r
+SUFFIXES = .cpp\r
 \r
 !IFDEF DEBUG\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
-CC_FILES= \\r
-       stream_decoder.cc \\r
-       stream_encoder.cc\r
+CPP_FILES= \\r
+       stream_decoder.cpp \\r
+       stream_encoder.cpp\r
 \r
-OBJS= $(CC_FILES:.cc=.obj)\r
+OBJS= $(CPP_FILES:.cpp=.obj)\r
 \r
 all: libOggFLAC++.lib\r
 \r
 libOggFLAC++.lib: $(OBJS)\r
        link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS)\r
 \r
-# can't figure out how to get it to take .cc so we just hack it for now:\r
-stream_decoder.obj: stream_decoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_decoder.cc\r
-stream_encoder.obj: stream_encoder.cc\r
-       $(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_encoder.cc\r
-\r
 clean:\r
        -del *.obj *.pch\r
        -del ..\..\obj\lib\libOggFLAC++.lib ..\..\obj\lib\libOggFLAC++.pdb\r
diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc
index d8ff518..4ac5f03 100644 (file)
--- a/src/test_libFLAC++/Makefile.vc
+++ b/src/test_libFLAC++/Makefile.vc
@@ -17,7 +17,7 @@
 \r
 !include <win32.mak>\r
 \r
-SUFFIXES = .cc\r
+SUFFIXES = .cpp\r
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
@@ -28,45 +28,31 @@ SUFFIXES = .cc
 !endif\r
 \r
 !IFDEF DEBUG\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r
        file_utils.c\r
 \r
-CC_FILES= \\r
-       decoders.cc \\r
-       encoders.cc \\r
-       main.cc \\r
-       metadata.cc \\r
-       metadata_manip.cc \\r
-       metadata_object.cc\r
+CPP_FILES= \\r
+       decoders.cpp \\r
+       encoders.cpp \\r
+       main.cpp \\r
+       metadata.cpp \\r
+       metadata_manip.cpp \\r
+       metadata_object.cpp\r
 \r
 C_OBJS= $(C_FILES:.c=.obj)\r
-CC_OBJS= $(CC_FILES:.cc=.obj)\r
+CPP_OBJS= $(CPP_FILES:.cpp=.obj)\r
 \r
 all: test_libFLAC++.exe\r
 \r
-# can't figure out how to get it to take .cc so we just hack it for now:\r
-decoders.obj: decoders.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP decoders.cc\r
-encoders.obj: encoders.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP encoders.cc\r
-main.obj: main.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP main.cc\r
-metadata.obj: metadata.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata.cc\r
-metadata_manip.obj: metadata_manip.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata_manip.cc\r
-metadata_object.obj: metadata_object.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata_object.cc\r
-\r
-test_libFLAC++.exe: $(C_OBJS) $(CC_OBJS)\r
-       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CC_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib\r
+test_libFLAC++.exe: $(C_OBJS) $(CPP_OBJS)\r
+       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib\r
 \r
 clean:\r
        -del *.obj *.pch\r
diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc
index 70932a3..cc39114 100644 (file)
--- a/src/test_libOggFLAC++/Makefile.vc
+++ b/src/test_libOggFLAC++/Makefile.vc
@@ -17,7 +17,7 @@
 \r
 !include <win32.mak>\r
 \r
-SUFFIXES = .cc\r
+SUFFIXES = .cpp\r
 \r
 !IFDEF DEBUG\r
 .c.obj:\r
@@ -28,36 +28,28 @@ SUFFIXES = .cc
 !endif\r
 \r
 !IFDEF DEBUG\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<\r
 !else\r
-.cc.obj:\r
+.cpp.obj:\r
        $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<\r
 !endif\r
 \r
 C_FILES= \\r
        file_utils.c\r
 \r
-CC_FILES= \\r
-       decoders.cc \\r
-       encoders.cc \\r
-       main.cc\r
+CPP_FILES= \\r
+       decoders.cpp \\r
+       encoders.cpp \\r
+       main.cpp\r
 \r
 C_OBJS= $(C_FILES:.c=.obj)\r
-CC_OBJS= $(CC_FILES:.cc=.obj)\r
+CPP_OBJS= $(CPP_FILES:.cpp=.obj)\r
 \r
 all: test_libOggFLAC++.exe\r
 \r
-# can't figure out how to get it to take .cc so we just hack it for now:\r
-decoders.obj: decoders.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP decoders.cc\r
-encoders.obj: encoders.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP encoders.cc\r
-main.obj: main.cc\r
-       $(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP main.cc\r
-\r
-test_libOggFLAC++.exe: $(C_OBJS) $(CC_OBJS)\r
-       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CC_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib\r
+test_libOggFLAC++.exe: $(C_OBJS) $(CPP_OBJS)\r
+       link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib\r
 \r
 clean:\r
        -del *.obj *.pch\r
Domain: Multimedia / Audio FW;