2007-04-23 23:28:04 +02:00
|
|
|
--- Makefile.in.orig Tue Apr 10 14:08:58 2007
|
|
|
|
+++ Makefile.in Sat Apr 21 23:23:50 2007
|
|
|
|
@@ -4,7 +4,7 @@
|
2006-07-01 18:45:02 +02:00
|
|
|
# Name the output files *.ol instead of *.o
|
|
|
|
# so we definitely know it is for Linux.
|
|
|
|
# (*.o files can be present by mistake)
|
|
|
|
-LCC = gcc
|
2007-04-23 23:28:04 +02:00
|
|
|
+LCC = ${CC}
|
|
|
|
WCC = /usr/bin/i586-mingw32msvc-gcc
|
|
|
|
WINWCC = C:\mingw\bin\mingw32-gcc
|
|
|
|
NASM = nasm
|
|
|
|
@@ -14,13 +14,10 @@
|
2006-07-01 18:45:02 +02:00
|
|
|
# so we definitely know it is for Windows.
|
|
|
|
# (*.o files can be present by mistake)
|
|
|
|
# Always use the same flags.
|
|
|
|
-CFL = -g -O -DOSNUM=1 -W -Wimplicit -Wreturn-type -Wformat \
|
2007-04-23 23:28:04 +02:00
|
|
|
-@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
|
2006-07-01 18:45:02 +02:00
|
|
|
--Wparentheses -Wstrict-prototypes -Werror -ffast-math \
|
|
|
|
--fomit-frame-pointer -c -o
|
2007-04-23 23:28:04 +02:00
|
|
|
+CFL = ${CFLAGS} -DOSNUM=1 -I${X11BASE}/include -c -o
|
2006-07-01 18:45:02 +02:00
|
|
|
CFW = -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \
|
|
|
|
-Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
|
2007-04-23 23:28:04 +02:00
|
|
|
--Wparentheses -Wstrict-prototypes -Werror -ffast-math \
|
|
|
|
+-Wparentheses -Wstrict-prototypes -ffast-math \
|
|
|
|
-fomit-frame-pointer -c -o
|
|
|
|
# Define dependencies for routines used both in Linux and Windows
|
|
|
|
|
|
|
|
@@ -624,7 +621,7 @@
|
|
|
|
meter_graph.ol fonts.ol screensub.ol lxsys.ol
|
2006-12-04 00:21:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
- gcc -olinrad -lvgagl -lvga -lpthread -lm \
|
2007-02-27 18:06:35 +01:00
|
|
|
+ $(CC) -olinrad -lvgagl -lvga -pthread -lm \
|
2006-12-04 00:21:04 +01:00
|
|
|
-Wl,-Map,linrad.lmap,-warn-common \
|
2007-04-23 23:28:04 +02:00
|
|
|
lmain.ol lvar.ol ui.ol lsetad.ol fft1.ol buf.ol \
|
2006-12-04 00:21:04 +01:00
|
|
|
mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \
|
2007-04-23 23:28:04 +02:00
|
|
|
@@ -671,7 +668,7 @@
|
2006-12-04 00:21:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- gcc -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
|
2007-02-27 18:06:35 +01:00
|
|
|
+ $(CC) -oxlinrad -L/usr/X11R6/lib -lX11 -pthread -lm \
|
2006-12-04 00:21:04 +01:00
|
|
|
-Wl,-Map,linrad.xmap,-warn-common \
|
2007-04-23 23:28:04 +02:00
|
|
|
xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol \
|
2006-12-04 00:21:04 +01:00
|
|
|
mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \
|