From 0f45d57fdd0722bd3b5dd2cb00871865bcbf2a48 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 6 Aug 2004 19:47:16 +0000 Subject: [PATCH 1/1] Compile gsockpm.cpp instead of gsockpm.c for wxOS/2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 16 ++++++++-------- build/bakefiles/files.bkl | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 35240aef53..adcb0af1fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8238,8 +8238,8 @@ monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP) monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONODLL_ODEP) - $(CCC) -c -o $@ $(MONODLL_CFLAGS) $< +monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11217,8 +11217,8 @@ monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP) monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(MONOLIB_ODEP) - $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $< +monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14748,8 +14748,8 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(COREDLL_ODEP) coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(COREDLL_ODEP) - $(CCC) -c -o $@ $(COREDLL_CFLAGS) $< +coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -17181,8 +17181,8 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.cpp $(CORELIB_ODEP) corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c $(CORELIB_ODEP) - $(CCC) -c -o $@ $(CORELIB_CFLAGS) $< +corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 65c07d33be..971cd21273 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1446,7 +1446,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/os2/gauge.cpp src/os2/gdiimage.cpp src/os2/gdiobj.cpp - src/os2/gsockpm.c + src/os2/gsockpm.cpp src/os2/helpwin.cpp src/os2/icon.cpp src/os2/iniconf.cpp -- 2.47.2