Skip to content

GitLab

Commit 18db4f46 authored by Josh Coalson's avatar Josh Coalson
Browse files

change .cc suffix to .cpp

parent f420524f
Hide whitespace changes
Inline Side-by-side
flac.pbproj/project.pbxproj
View file @ 18db4f46
......@@ -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 = {
......
src/libFLAC++/Makefile.vc
View file @ 18db4f46
......@@ -18,48 +18,32 @@
!include <win32.mak>
SUFFIXES = .cc
SUFFIXES = .cpp
!IFDEF DEBUG
.cc.obj:
.cpp.obj:
$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cc.obj:
.cpp.obj:
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
CC_FILES= \
file_decoder.cc \
file_encoder.cc \
metadata.cc \
seekable_stream_decoder.cc \
seekable_stream_encoder.cc \
stream_decoder.cc \
stream_encoder.cc
CPP_FILES= \
file_decoder.cpp \
file_encoder.cpp \
metadata.cpp \
seekable_stream_decoder.cpp \
seekable_stream_encoder.cpp \
stream_decoder.cpp \
stream_encoder.cpp
OBJS= $(CC_FILES:.cc=.obj)
OBJS= $(CPP_FILES:.cpp=.obj)
all: libFLAC++.lib
libFLAC++.lib: $(OBJS)
link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS)
# can't figure out how to get it to take .cc so we just hack it for now:
file_decoder.obj: file_decoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP file_decoder.cc
file_encoder.obj: file_encoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP file_encoder.cc
metadata.obj: metadata.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata.cc
seekable_stream_decoder.obj: seekable_stream_decoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP seekable_stream_decoder.cc
seekable_stream_encoder.obj: seekable_stream_encoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP seekable_stream_encoder.cc
stream_decoder.obj: stream_decoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_decoder.cc
stream_encoder.obj: stream_encoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_encoder.cc
clean:
-del *.obj *.pch
-del ..\..\obj\lib\libFLAC++.lib ..\..\obj\lib\libFLAC++.pdb
src/libOggFLAC++/Makefile.vc
View file @ 18db4f46
......@@ -18,33 +18,27 @@
!include <win32.mak>
SUFFIXES = .cc
SUFFIXES = .cpp
!IFDEF DEBUG
.cc.obj:
.cpp.obj:
$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cc.obj:
.cpp.obj:
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
CC_FILES= \
stream_decoder.cc \
stream_encoder.cc
CPP_FILES= \
stream_decoder.cpp \
stream_encoder.cpp
OBJS= $(CC_FILES:.cc=.obj)
OBJS= $(CPP_FILES:.cpp=.obj)
all: libOggFLAC++.lib
libOggFLAC++.lib: $(OBJS)
link.exe -lib /nodefaultlib -out:../../obj/lib/$*.lib $(OBJS)
# can't figure out how to get it to take .cc so we just hack it for now:
stream_decoder.obj: stream_decoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_decoder.cc
stream_encoder.obj: stream_encoder.cc
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP stream_encoder.cc
clean:
-del *.obj *.pch
-del ..\..\obj\lib\libOggFLAC++.lib ..\..\obj\lib\libOggFLAC++.pdb
src/test_libFLAC++/Makefile.vc
View file @ 18db4f46
......@@ -17,7 +17,7 @@
!include <win32.mak>
SUFFIXES = .cc
SUFFIXES = .cpp
!IFDEF DEBUG
.c.obj:
......@@ -28,45 +28,31 @@ SUFFIXES = .cc
!endif
!IFDEF DEBUG
.cc.obj:
.cpp.obj:
$(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cc.obj:
.cpp.obj:
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
file_utils.c
CC_FILES= \
decoders.cc \
encoders.cc \
main.cc \
metadata.cc \
metadata_manip.cc \
metadata_object.cc
CPP_FILES= \
decoders.cpp \
encoders.cpp \
main.cpp \
metadata.cpp \
metadata_manip.cpp \
metadata_object.cpp
C_OBJS= $(C_FILES:.c=.obj)
CC_OBJS= $(CC_FILES:.cc=.obj)
CPP_OBJS= $(CPP_FILES:.cpp=.obj)
all: test_libFLAC++.exe
# can't figure out how to get it to take .cc so we just hack it for now:
decoders.obj: decoders.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP decoders.cc
encoders.obj: encoders.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP encoders.cc
main.obj: main.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP main.cc
metadata.obj: metadata.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata.cc
metadata_manip.obj: metadata_manip.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata_manip.cc
metadata_object.obj: metadata_object.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP metadata_object.cc
test_libFLAC++.exe: $(C_OBJS) $(CC_OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CC_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib
test_libFLAC++.exe: $(C_OBJS) $(CPP_OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib
clean:
-del *.obj *.pch
......
src/test_libOggFLAC++/Makefile.vc
View file @ 18db4f46
......@@ -17,7 +17,7 @@
!include <win32.mak>
SUFFIXES = .cc
SUFFIXES = .cpp
!IFDEF DEBUG
.c.obj:
......@@ -28,36 +28,28 @@ SUFFIXES = .cc
!endif
!IFDEF DEBUG
.cc.obj:
.cpp.obj:
$(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cc.obj:
.cpp.obj:
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
file_utils.c
CC_FILES= \
decoders.cc \
encoders.cc \
main.cc
CPP_FILES= \
decoders.cpp \
encoders.cpp \
main.cpp
C_OBJS= $(C_FILES:.c=.obj)
CC_OBJS= $(CC_FILES:.cc=.obj)
CPP_OBJS= $(CPP_FILES:.cpp=.obj)
all: test_libOggFLAC++.exe
# can't figure out how to get it to take .cc so we just hack it for now:
decoders.obj: decoders.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP decoders.cc
encoders.obj: encoders.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP encoders.cc
main.obj: main.cc
$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG /TP main.cc
test_libOggFLAC++.exe: $(C_OBJS) $(CC_OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CC_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib
test_libOggFLAC++.exe: $(C_OBJS) $(CPP_OBJS)
link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib
clean:
-del *.obj *.pch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment