afd8c82892
Changes: * changed round(); to myround(); and fixed Makefile.Solaris * fixed qiv_display_text_window * added patch by Joachim Kuebart: if images is < 5 and PgUp is pressed, * mage_index might become negative.. * small patch that remove a warning with gcc 3.4 * qiv_display_text_window update (Push any key..) - its really cool! :-) * cleaned up README, qiv-command.example, manpage.. * Fixed Help-Screen remove. Added qiv-command-stdout support, now "metacam" (EXIF-Header) or other tools can be used within qiv and the output is shown in a box in the pixture like the helpscreen. * All arrow-keys = normal moving. All arrow-keys+Shift = faster moving. NumPad-arrow-keys+NumLock = faster moving. * Added Xinerama patch by Jeff Dairiki * fixed manpage (ignore_path_sort was wrong) * Added patch by HaJo Schatz: "--disable_grab, -G" Disable pointer/kbd grab in fullscreen mode for Remote-Display stuff.
55 lines
1.8 KiB
Text
55 lines
1.8 KiB
Text
$NetBSD: patch-aa,v 1.5 2004/11/26 22:18:28 snj Exp $
|
|
|
|
--- Makefile.orig 2004-05-22 00:21:47.000000000 -0700
|
|
+++ Makefile 2004-11-26 14:05:41.000000000 -0800
|
|
@@ -4,7 +4,7 @@
|
|
#######################################################################
|
|
|
|
# Directory where qiv will be installed under.
|
|
-PREFIX = /usr/local
|
|
+#PREFIX = /usr/local
|
|
|
|
# Font to use for statusbar in fullscreen mode
|
|
STATUSBAR_FONT = "fixed"
|
|
@@ -57,11 +57,6 @@ SS_RANDOMIZE = -r
|
|
# Do not edit below here!
|
|
######################################################################
|
|
|
|
-CC = gcc
|
|
-CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
|
|
- -fcaller-saves -ffast-math -fno-strength-reduce \
|
|
- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
|
-
|
|
INCLUDES = `imlib-config --cflags-gdk`
|
|
LIBS = `imlib-config --libs-gdk`
|
|
|
|
@@ -96,10 +91,10 @@ SS_PROG = $(PREFIX)/ss-qiv
|
|
all: $(PROGRAM)
|
|
|
|
$(PROGRAM): $(OBJS)
|
|
- $(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM)
|
|
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
|
|
|
|
$(OBJS): %.o: %.c $(HEADERS)
|
|
- $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
|
|
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
|
|
|
|
main.o: main.h
|
|
|
|
@@ -124,14 +119,8 @@ distclean : clean
|
|
|
|
install: $(PROGRAM)
|
|
@echo "Installing QIV..."
|
|
- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
|
|
- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
|
|
- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
|
|
- @if ./qiv -f ./intro.jpg ; \
|
|
- then echo "-- Test Passed --" ; \
|
|
- else echo "-- Test Failed --" ; \
|
|
- fi
|
|
- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
|
|
+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
|
|
+ $(BSD_INSTALL_DATA) $(PROGRAM).1 $(PREFIX)/man/man1
|
|
|
|
install-xscreensaver: install
|
|
@echo "#!/bin/sh" > $(SS_PROG)
|