2008-03-18 16:55:06 +01:00
|
|
|
--- Makefile.in.orig 2008-01-24 23:49:58.000000000 -0500
|
|
|
|
+++ Makefile.in 2008-03-18 11:53:07.000000000 -0400
|
2007-04-23 23:28:04 +02:00
|
|
|
@@ -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
|
2007-07-10 18:41:16 +02:00
|
|
|
@@ -14,10 +14,7 @@
|
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
|
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
2008-04-19 19:56:05 +02:00
|
|
|
+CFL = ${CFLAGS} -DOSNUM=1 -I${LOCALBASE}/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-07-10 18:41:16 +02:00
|
|
|
-Wparentheses -Wstrict-prototypes -Werror -ffast-math \
|
2008-03-18 16:55:06 +01:00
|
|
|
@@ -636,7 +633,7 @@
|
2007-09-28 04:23:00 +02:00
|
|
|
meter_graph.ol fonts.ol screensub.ol tx_graph.ol txssb.ol lxsys.ol
|
2006-12-04 00:21:04 +01:00
|
|
|
|
|
|
|
|
2007-07-10 18:41:16 +02:00
|
|
|
- gcc @MEM@ -olinrad -lvgagl -lvga -lpthread -lm \
|
|
|
|
+ ${CC} @MEM@ -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 \
|
2008-03-18 16:55:06 +01:00
|
|
|
@@ -683,7 +680,7 @@
|
2006-12-04 00:21:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
2007-07-10 18:41:16 +02:00
|
|
|
- gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
|
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
2008-04-19 19:56:05 +02:00
|
|
|
+ $(LCC) @MEM@ -oxlinrad -L${LOCALBASE}/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 \
|