Attachment 139196 Details for Bug 185398 – file.diff

[patch] file.diff

file.diff (text/plain), 2.84 KB, created by Stephen Hurd on 2014-01-01 22:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Hurd

Created: 2014-01-01 22:00:00 UTC

Size: 2.84 KB

patch

obsolete

>--- Makefile.orig	2004-09-29 15:12:16.000000000 -0700
>+++ Makefile	2014-01-01 08:57:44.000000000 -0800
>@@ -9,12 +9,12 @@
> m.exe: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
>     Knob.cxx Knob.h Help.h m.fl
> 	fluid -c m.fl
>-	g++ -c -Os `fltk-config --cxxflags` m.cxx
>-	g++ -c -Os `fltk-config --cxxflags` Bargraph.cxx
>-	g++ -c -Os `fltk-config --cxxflags` Codebox.cxx
>-	g++ -c -Os `fltk-config --cxxflags` Knob.cxx
>-	g++ -c -Os  -I/usr/local/include/SDL Cw.cxx
>-	g++ -om.exe m.o Bargraph.o Codebox.o Cw.o Knob.o \
>+	${CXX} -c -Os `fltk-config --cxxflags` m.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
>+	${CXX} -c -Os  -I/usr/local/include/SDL Cw.cxx
>+	${CXX} -om.exe m.o Bargraph.o Codebox.o Cw.o Knob.o \
> 	  -static `fltk-config --ldstaticflags` \
> 	  -lSDL -lmingw32 -lmingwex -lwinmm -lSDLmain	  
> 	strip m.exe
>@@ -25,24 +25,43 @@
> m: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
>     Knob.cxx Knob.h Help.h m.fl
> 	fluid -c m.fl
>-	g++ -c -Os `fltk-config --cxxflags` m.cxx
>-	g++ -c -Os `fltk-config --cxxflags` Bargraph.cxx	
>-	g++ -c -Os `fltk-config --cxxflags` Codebox.cxx
>-	g++ -c -Os `fltk-config --cxxflags` Knob.cxx
>-	g++ -c -Os `sdl-config    --cflags` Cw.cxx
>-	g++ -static -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
>+	${CXX} -c -Os `fltk-config --cxxflags` m.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx	
>+	${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
>+	${CXX} -c -Os `sdl-config    --cflags` Cw.cxx
>+	${CXX} -static -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
> 	  `sdl-config --static-libs` \
> 	  `fltk-config --ldstaticflags` -ldl
> 	strip m
> 	rm *.o m.cxx m.h
> 
>+# Regular "make" is what you want for the FreeBSD version
>+
>+all: m.fl Bargraph.cxx Bargraph.h Codebox.cxx Codebox.h Cw.cxx Cw.h \
>+    Knob.cxx Knob.h Help.h m.fl
>+	fluid -c m.fl
>+	${CXX} -c -Os `fltk-config --cxxflags` m.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Bargraph.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Codebox.cxx
>+	${CXX} -c -Os `fltk-config --cxxflags` Knob.cxx
>+	${CXX} -c -Os `sdl-config    --cflags` Cw.cxx
>+	${CXX} -om m.o Bargraph.o Codebox.o Cw.o Knob.o \
>+          `sdl-config --static-libs` \
>+          `fltk-config --ldstaticflags`
>+	strip m
>+	rm *.o m.cxx m.h
>+
>+install: m
>+	${INSTALL} -o root -g wheel -m 0555 m ${PREFIX}/bin/xmorse
>+
> # Besemer's Python extension version
> 
> cw.so: cw.pyx Cw.cxx Cw.h
> 	pyrexc cw.pyx
>-	gcc -c -fPIC -I/usr/include/python2.3 cw.c
>-	gcc -c -fPIC `sdl-config --cflags` Cw.cxx
>-	g++ -shared cw.o Cw.o -static `sdl-config --static-libs` -ocw.so
>+	${CC} -c -fPIC -I/usr/include/python2.3 cw.c
>+	${CC} -c -fPIC `sdl-config --cflags` Cw.cxx
>+	${CXX} -shared cw.o Cw.o -static `sdl-config --static-libs` -ocw.so
> 	rm cw.c *.o
> 
> Help.h: m.htm

Actions: View | Diff

Attachments on bug 185398: 139196 | 139197