109 lines
4.1 KiB
Plaintext
109 lines
4.1 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.8 2009/12/09 21:55:01 jsg Exp $
|
|
--- Makefile.orig Sat Nov 7 00:56:59 2009
|
|
+++ Makefile Sat Nov 14 12:05:40 2009
|
|
@@ -9,7 +9,7 @@ srcdir ?= .
|
|
|
|
DEFINES := -DUNIX
|
|
LDFLAGS := $(LDFLAGS)
|
|
-INCLUDES := -I. -I$(srcdir)
|
|
+INCLUDES := -I. -I$(srcdir) `pkg-config --cflags libpng vorbis vorbisenc`
|
|
LIBS :=
|
|
OBJS :=
|
|
DEPDIR := .deps
|
|
@@ -19,8 +19,6 @@ DEPDIR := .deps
|
|
# manually create a config.mk files with overrides, if needed.
|
|
-include config.mk
|
|
|
|
-CXXFLAGS += -g -O -Wuninitialized
|
|
-
|
|
# Additional warnings
|
|
CXXFLAGS:= -Wall $(CXXFLAGS)
|
|
# Turn off some annoying and not-so-useful warnings
|
|
@@ -46,8 +44,8 @@ RM ?= rm -f
|
|
RM_REC ?= $(RM) -r
|
|
ZIP ?= zip -q
|
|
|
|
-CC := gcc
|
|
-CXX := g++
|
|
+#CC := gcc
|
|
+#CXX := g++
|
|
|
|
#######################################################################
|
|
|
|
@@ -89,8 +87,8 @@ TARGETS := \
|
|
extract_scumm_mac$(EXEEXT) \
|
|
extract_t7g_mac$(EXEEXT) \
|
|
extract_zak_c64$(EXEEXT) \
|
|
- extract_gob_stk$(EXEEXT) \
|
|
- tools_gui$(EXEEXT)
|
|
+ extract_gob_stk$(EXEEXT)
|
|
+# tools_gui$(EXEEXT)
|
|
|
|
UTILS := \
|
|
utils/adpcm.o \
|
|
@@ -117,43 +115,43 @@ bundle: $(TARGETS)
|
|
mv $(bundle_name)/Contents/Resources/tools_gui $(bundle_name)/Contents/MacOS/
|
|
|
|
compress_agos$(EXEEXT): compress_agos.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_gob$(EXEEXT): compress_gob.o util.o
|
|
$(CXX) $(LDFLAGS) -o $@ $+
|
|
|
|
compress_kyra$(EXEEXT): compress_kyra.o kyra_pak.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_queen$(EXEEXT): compress_queen.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_saga$(EXEEXT): compress_saga.o compress.o util.o $(UTILS)
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lz -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ -lz `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_scumm_sou$(EXEEXT): compress_scumm_sou.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_sword1$(EXEEXT): compress_sword1.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_sword2$(EXEEXT): compress_sword2.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_tinsel$(EXEEXT): compress_tinsel.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_touche$(EXEEXT): compress_touche.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
compress_tucker$(EXEEXT): compress_tucker.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
|
|
|
|
decine$(EXEEXT): decine.o
|
|
$(CXX) $(LDFLAGS) -o $@ $+
|
|
@@ -171,7 +169,7 @@ degob$(EXEEXT): degob.o degob_script.o degob_script_v1
|
|
$(CXX) $(LDFLAGS) -o $@ $+
|
|
|
|
encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
|
|
- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
|
|
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs libpng vorbis vorbisenc flac`
|
|
|
|
extract_cine$(EXEEXT): extract_cine.o util.o
|
|
$(CXX) $(LDFLAGS) -o $@ $+
|