diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-28 08:34:21 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-28 08:34:21 +0000 |
| commit | 879c21205012b7a84c8e58fc8445491e9eee14c3 (patch) | |
| tree | fb4ad766d7ddf92d3ac29fca804a1901acee6309 /games/jigzo/files | |
| parent | 39fcf29276c95d3074869924a412e00cd9f28336 (diff) | |
| download | ports-879c21205012b7a84c8e58fc8445491e9eee14c3.tar.gz ports-879c21205012b7a84c8e58fc8445491e9eee14c3.zip | |
Notes
Diffstat (limited to 'games/jigzo/files')
| -rw-r--r-- | games/jigzo/files/patch-Loader.cxx | 13 | ||||
| -rw-r--r-- | games/jigzo/files/patch-Makefile | 40 | ||||
| -rw-r--r-- | games/jigzo/files/patch-main.cxx | 10 |
3 files changed, 22 insertions, 41 deletions
diff --git a/games/jigzo/files/patch-Loader.cxx b/games/jigzo/files/patch-Loader.cxx deleted file mode 100644 index 39b86aa1e8e7..000000000000 --- a/games/jigzo/files/patch-Loader.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- Loader.cxx.orig Mon Feb 6 13:45:24 2006 -+++ Loader.cxx Mon Feb 6 13:45:04 2006 -@@ -20,8 +20,10 @@ - - #include "Loader.hxx" - -+extern "C" { - #include <png.h> - #include <jpeglib.h> -+} - - void JpgLoader::Load(const std::string& filename,RGB& target,int x,int y) - { diff --git a/games/jigzo/files/patch-Makefile b/games/jigzo/files/patch-Makefile index d5ce0891df88..7e5988e82e22 100644 --- a/games/jigzo/files/patch-Makefile +++ b/games/jigzo/files/patch-Makefile @@ -1,21 +1,25 @@ ---- Makefile.orig Sun Feb 5 04:41:46 2006 -+++ Makefile Sun Feb 5 23:05:34 2006 -@@ -1,8 +1,6 @@ - PROGRAM = glpuzzle +--- Makefile.orig 2008-04-03 01:16:52.000000000 +0400 ++++ Makefile 2008-04-03 13:45:02.000000000 +0400 +@@ -19,7 +19,7 @@ + ARCH_OK = yes + endif --CXXFLAGS = -O2 -Wall --INCLFLAGS = -I/usr/include/SDL --LIBSFLAGS = -lpthread -lGL -lpthread -lpng -ljpeg -lSDL -+LIBSFLAGS = $(LDFLAGS) -lGL -lpng -ljpeg - SOURCES = main.cxx Screen.cxx Texture.cxx Loader.cxx +-ifeq "$(ARCH_OK)" "yes" ++ifeq "yes" "yes" + # + # The given ARCH is correct + # +@@ -28,8 +28,11 @@ + # Variables + # - ENABLE_SOUND = 1 -@@ -43,7 +41,7 @@ - g++ -c $(CXXFLAGS) $(INCLFLAGS) $< -o $@ +-CXXFLAGS = -O2 $(ARCHCXXFLAGS) -DENABLE_SOUND +-LDFLAGS = -O2 $(ARCHLDFLAGS) ++STRIP = strip ++APP = jigzo ++ ++CXXFLAGS += `$(SDL_CONFIG) --cflags` -DENABLE_SOUND ++LDFLAGS += `$(SDL_CONFIG) --libs` -lGL -lpng -ljpeg -lSDL_mixer - $(PROGRAM): $(OBJECTS) -- g++ $(OBJECTS) $(LIBSFLAGS) -o $@ -+ g++ $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) $(LIBSFLAGS) -o $@ - - install: $(PROGRAM) - @echo Installing in $(PREFIX) + # + # List of all source files. diff --git a/games/jigzo/files/patch-main.cxx b/games/jigzo/files/patch-main.cxx deleted file mode 100644 index df5e2962e8cc..000000000000 --- a/games/jigzo/files/patch-main.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- main.cxx.orig Sun Feb 5 04:41:46 2006 -+++ main.cxx Sun Feb 5 23:41:41 2006 -@@ -28,6 +28,7 @@ - float BG_G = 0.0; - float BG_B = 0.0; - -+#include <unistd.h> - #include <cstdio> - #include <cstring> - #include <cmath> |