Attachment #61572 for bug #92237

View | Details | Raw Unified | Return to bug 92237
Collapse All | Expand All

Lines 6-12 Link Here

(-)holotz-castle/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= holotz-castle	8	PORTNAME= holotz-castle
9	PORTVERSION= 1.3.7	9	PORTVERSION= 1.3.8
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/	11	MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/
12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src

Lines 1-3 Link Here

(-)holotz-castle/distinfo (-3 / +3 lines)
1	MD5 (holotz-castle-1.3.7-src.tar.gz) = 571be7f4dadf81f0eb5df7bee65d215b	1	MD5 (holotz-castle-1.3.8-src.tar.gz) = 0d842884c943ef200b37057de7ee9f3a
2	SHA256 (holotz-castle-1.3.7-src.tar.gz) = ab25f02657a55e70d0dd1b3cb2e911e45639477fc67084fd3372148779debf32	2	SHA256 (holotz-castle-1.3.8-src.tar.gz) = abb09158f8c6b4d105cdb7979e8f5b721f3cba17ceff3e7b12e3d1ed6bf78158
3	SIZE (holotz-castle-1.3.7-src.tar.gz) = 3612543	3	SIZE (holotz-castle-1.3.8-src.tar.gz) = 3612345




diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp
--- JLib/JLib/Util/JFS.cpp	Fri Jan 20 08:59:37 2006
+++ holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp	Mon Jan 23 21:21:36 2006
@@ -33,7 +33,7 @@
 #include <JLib/Util/JTypes.h>
 #include <JLib/Graphics/JControl.h>
 #include <JLib/Graphics/JImage.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 /** Control de interfaz de usuario compuesto por imágenes.
  */
diff -ru JLib/JLib/Graphics/JFont.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h
--- JLib/JLib/Graphics/JFont.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h	Tue Jan  3 20:16:47 2006
@@ -31,7 +31,7 @@
 #define _JFONT_INCLUDED
 
 #include <JLib/Graphics/JImage.h>
-#include <SDL/SDL_ttf.h>
+#include <SDL_ttf.h>
 #include <stdarg.h>
 
 /** Alineación del texto a renderizar.
diff -ru JLib/JLib/Graphics/JGLAxes.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h
--- JLib/JLib/Graphics/JGLAxes.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h	Tue Jan  3 20:16:47 2006
@@ -31,7 +31,7 @@
 
 #include <JLib/Util/JTypes.h>
 #include <JLib/Graphics/JDrawable.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 
 class JGLAxes : public JDrawable
diff -ru JLib/JLib/Graphics/JGLCamera.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h
--- JLib/JLib/Graphics/JGLCamera.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h	Tue Jan  3 20:16:47 2006
@@ -40,7 +40,7 @@
 #include <JLib/Util/JTypes.h>
 #include <JLib/Util/JObject.h>
 #include <JLib/Math/JMath.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 
diff -ru JLib/JLib/Graphics/JGLGrid.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h
--- JLib/JLib/Graphics/JGLGrid.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h	Tue Jan  3 20:16:47 2006
@@ -32,7 +32,7 @@
 #include <JLib/Util/JTypes.h>
 #include <JLib/Graphics/JDrawable.h>
 #include <JLib/Graphics/JGLColor.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 
 class JGLGrid : public JDrawable
diff -ru JLib/JLib/Graphics/JGLLight.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h
--- JLib/JLib/Graphics/JGLLight.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h	Tue Jan  3 20:16:47 2006
@@ -33,7 +33,7 @@
 #include <JLib/Util/JObject.h>
 #include <JLib/Math/JVector.h>
 #include <JLib/Graphics/JGLColor.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 
 // Clase para gestión de texturas
diff -ru JLib/JLib/Graphics/JGLText.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h
--- JLib/JLib/Graphics/JGLText.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h	Tue Jan  3 20:16:47 2006
@@ -33,7 +33,7 @@
 #include <JLib/Util/JString.h>
 #include <JLib/Util/JGLApp.h>
 #include <JLib/Graphics/JFont.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 
 class JGLText : public JObject
diff -ru JLib/JLib/Graphics/JGLVector.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h
--- JLib/JLib/Graphics/JGLVector.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h	Tue Jan  3 20:16:47 2006
@@ -32,7 +32,7 @@
 
 #include <JLib/Util/JTypes.h>
 #include <JLib/Math/JVector.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 
 /** Vector en pantalla para OpenGL.
diff -ru JLib/JLib/Graphics/JImage.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h
--- JLib/JLib/Graphics/JImage.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h	Tue Jan  3 20:16:47 2006
@@ -36,8 +36,8 @@
 #include <JLib/Graphics/JDrawable.h>
 #include <JLib/Util/JString.h>
 #include <JLib/Util/JUtil.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 
 /** Imágen genérica.
  */
diff -ru JLib/JLib/Sound/JChunk.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h
--- JLib/JLib/Sound/JChunk.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h	Tue Jan  3 20:16:47 2006
@@ -30,7 +30,7 @@
 #ifndef _JCHUNK_INCLUDED
 #define _JCHUNK_INCLUDED
 
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
 
 /** Encapsula una muestra de audio.
  */
diff -ru JLib/JLib/Sound/JMixer.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h
--- JLib/JLib/Sound/JMixer.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h	Tue Jan  3 20:16:47 2006
@@ -30,7 +30,7 @@
 #ifndef _JMIXER_INCLUDED
 #define _JMIXER_INCLUDED
 
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
 #include <JLib/Util/JTypes.h>
 #include <JLib/Sound/JChunk.h>
 
diff -ru JLib/JLib/Util/JApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h
--- JLib/JLib/Util/JApp.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h	Tue Jan  3 20:16:47 2006
@@ -35,7 +35,7 @@
 #include <JLib/Util/JTimer.h>
 #include <JLib/Graphics/JFont.h>
 #include <JLib/Sound/JMixer.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -53,7 +53,7 @@
  * <pre>
  * 
  * #include <JLib/Util/JApp.h>
- * #include <SDL/SDL_keysym.h>
+ * #include <SDL_keysym.h>
  * #include <stdio.h>
  * 
  * class MyApp : public JApp
diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp
--- JLib/JLib/Util/JFS.cpp	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp	Wed Jan  4 01:20:59 2006
@@ -886,8 +886,8 @@
 		s32 n, k;
 

 
 		if (n < 0)
 		{
diff -ru JLib/Makefile holotz-castle-1.3.8-src/JLib/Makefile
--- JLib/Makefile	Fri Jan 20 08:59:37 2006
+++ holotz-castle-1.3.8-src/JLib/Makefile	Mon Jan 23 21:20:53 2006
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
-#include <SDL/SDL_endian.h>
+#include <SDL_endian.h>
 #include <zlib.h>
 #include <JLib/Util/JCompatibility.h>
 
diff -ru JLib/JLib/Util/JGLApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h
--- JLib/JLib/Util/JGLApp.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h	Tue Jan  3 20:16:47 2006
@@ -35,7 +35,7 @@
 #endif
 
 #include <JLib/Util/JApp.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <stdio.h>
diff -ru JLib/JLib/Util/JRW.h holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h
--- JLib/JLib/Util/JRW.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h	Tue Jan  3 20:16:47 2006
@@ -33,8 +33,8 @@
 #include <JLib/Util/JTypes.h>
 #include <JLib/Util/JObject.h>
 #include <zlib.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
+#include <SDL.h>
+#include <SDL_endian.h>
 
 /** Encapsulates a SDL_RWops object. It's a simple wrapper.
  */
diff -ru JLib/JLib/Util/JTextUtil.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h
--- JLib/JLib/Util/JTextUtil.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h	Tue Jan  3 20:16:47 2006
@@ -30,7 +30,7 @@
 #define _JTEXTUTIL_INCLUDED
 
 #include <JLib/Util/JTypes.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 //#include <JLib/Graphics/JText.h>
 
 // Crea una superficie en formato RGBA de 32 bits con los caracteres en
diff -ru JLib/JLib/Util/JThread.h holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h
--- JLib/JLib/Util/JThread.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h	Tue Jan  3 20:16:47 2006
@@ -31,8 +31,8 @@
 #define _JTHREAD_INCLUDED
 
 #include <JLib/Util/JTypes.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_thread.h>
+#include <SDL.h>
+#include <SDL_thread.h>
 
 /** Base class for threads.
  */
diff -ru JLib/JLib/Util/JTimer.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h
--- JLib/JLib/Util/JTimer.h	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h	Tue Jan  3 20:16:47 2006
@@ -32,7 +32,7 @@
 
 #include <JLib/Util/JTypes.h>
 #include <JLib/Util/JObject.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
 #include <sys/types.h>
 #include <sys/timeb.h>
 #include <time.h>
diff -ru JLib/Makefile holotz-castle-1.3.7-src/JLib/Makefile
--- JLib/Makefile	Tue Jan  3 13:42:42 2006
+++ holotz-castle-1.3.7-src/JLib/Makefile	Wed Jan  4 12:23:28 2006
@@ -15,8 +15,8 @@
 					$(UTIL)/JApp.o $(UTIL)/JFS.o $(UTIL)/JThread.o $(UTIL)/JRW.o $(MATH)/J2DPolygon.o
 
 # Definir -D_JLIB_DEBUG para hacer debug de JLib. Compilar el programa a debugear también con este flag
-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
-LDFLAGS=-L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
+CFLAGS=`sdl11-config --cflags` -I/usr/X11R6/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
+LDFLAGS=`sdl11-config --libs` -L/usr/X11R6/lib -L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
 
 all: libJLib
 
diff -ru Makefile holotz-castle-1.3.7-src/Makefile
--- Makefile	Tue Jan  3 13:42:45 2006
+++ holotz-castle-1.3.7-src/Makefile	Wed Jan  4 12:11:52 2006
@@ -5,11 +5,11 @@
 HC_VERSION=1.3.7
 
 all: 
-	make -C src
+	$(MAKE) -C src
 
 distro-src:
 	find . -iname "*~" -exec 'rm' '{}' ';';
-	make clean;
+	$(MAKE) clean;
 	rm -rf _DISTRO/SRC;
 	mkdir -p _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src;\
 	cp -RL [^_h]* _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src &&\
@@ -20,7 +20,7 @@
 
 distro-i486:
 	find . -iname "*~" -exec 'rm' '{}' ';';
-	make I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
+	$(MAKE) I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
 	rm -rf _DISTRO/I486;
 	mkdir -p _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486;
 	cp -RL holotz-castle holotz-castle-editor res HCedHome doc LICENSE.txt MANUAL* _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486 &&\
@@ -39,11 +39,11 @@
 	rm -rf _DISTRO/WIN32/HC;
 
 install:
-	make -C src install
+	$(MAKE) -C src install
 
 uninstall:
-	make -C src uninstall;
+	$(MAKE) -C src uninstall;
 
 .PHONY: clean
 clean:
-	make -C src clean
+	$(MAKE) -C src clean
diff -ru src/Makefile holotz-castle-1.3.7-src/src/Makefile
--- src/Makefile	Tue Jan  3 13:42:45 2006
+++ holotz-castle-1.3.7-src/src/Makefile	Wed Jan  4 13:29:39 2006
@@ -18,10 +18,10 @@
 # comenta estas líneas si no quieres instalar el juego (y descomenta las de arriba)
 
 ifndef I486_BUILD
-HC_BASE = /usr/share/games/holotz-castle/
+#HC_BASE = /usr/share/games/holotz-castle/
 HC_DATA = $(HC_BASE)game/
 HCED_DATA = $(HC_BASE)editor/
-HC_BIN_DIR = /usr/local/bin/
+#HC_BIN_DIR = /usr/local/bin/
 endif
 
 # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
+CFLAGS=-I$(X11BASE)/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
 
 # Sample LDFLAGS for applications
 # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
diff -ru src/Makefile holotz-castle-1.3.8-src/src/Makefile
--- src/Makefile	Fri Jan 20 08:59:38 2006
+++ holotz-castle-1.3.8-src/src/Makefile	Mon Jan 23 21:12:33 2006
@@ -42,8 +42,8 @@
 
 # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo tambiÃ©n en el Makefile de JLib.
 # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
+CFLAGS=-I$(X11BASE)/include -I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
+LDFLAGS=-L$(X11BASE)/lib -L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
 
 JLib: 
-	make -C ../JLib;
+	$(MAKE) -C ../JLib;
 
 %.o: %.cpp %.h
 	g++ $(CFLAGS) $(DEFINES) $< -o $@
 
 HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
-	g++ $(LDFLAGS) $? -o $@;\
+	g++ $(LDFLAGS) $? -o $@ -l compat;\
 	mv HC ../holotz-castle
 
 JLib:
 HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
-	g++ $(LDFLAGS) $? -o $@;\
+	g++ $(LDFLAGS) $? -o $@ -lcompat;\
 	mv HCed ../holotz-castle-editor
 
 install:
@@ -75,4 +75,4 @@
 	rm -f ../holotz-castle;\
 	rm -f ../holotz-castle-editor;\
 	rm -f *\.o;\
-  make -C ../JLib clean
+	$(MAKE) -C ../JLib clean

Return to bug 92237

Lines 1-161 Link Here

(-)holotz-castle/files/patch-all (-332 / +22 lines)
1	diff -ru JLib/JLib/Graphics/JControlImage.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JControlImage.h	1	diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp
2	--- JLib/JLib/Graphics/JControlImage.h Tue Jan 3 13:42:42 2006	2	--- JLib/JLib/Util/JFS.cpp Fri Jan 20 08:59:37 2006
3	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JControlImage.h Tue Jan 3 20:16:47 2006	3	+++ holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp Mon Jan 23 21:21:36 2006
4	@@ -33,7 +33,7 @@
5	#include <JLib/Util/JTypes.h>
6	#include <JLib/Graphics/JControl.h>
7	#include <JLib/Graphics/JImage.h>
8	-#include <SDL/SDL.h>
9	+#include <SDL.h>
10
11	/** Control de interfaz de usuario compuesto por imágenes.
12	*/
13	diff -ru JLib/JLib/Graphics/JFont.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h
14	--- JLib/JLib/Graphics/JFont.h Tue Jan 3 13:42:42 2006
15	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h Tue Jan 3 20:16:47 2006
16	@@ -31,7 +31,7 @@
17	#define _JFONT_INCLUDED
18
19	#include <JLib/Graphics/JImage.h>
20	-#include <SDL/SDL_ttf.h>
21	+#include <SDL_ttf.h>
22	#include <stdarg.h>
23
24	/** Alineación del texto a renderizar.
25	diff -ru JLib/JLib/Graphics/JGLAxes.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h
26	--- JLib/JLib/Graphics/JGLAxes.h Tue Jan 3 13:42:42 2006
27	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h Tue Jan 3 20:16:47 2006
28	@@ -31,7 +31,7 @@
29
30	#include <JLib/Util/JTypes.h>
31	#include <JLib/Graphics/JDrawable.h>
32	-#include <SDL/SDL.h>
33	+#include <SDL.h>
34	#include <GL/gl.h>
35
36	class JGLAxes : public JDrawable
37	diff -ru JLib/JLib/Graphics/JGLCamera.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h
38	--- JLib/JLib/Graphics/JGLCamera.h Tue Jan 3 13:42:42 2006
39	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h Tue Jan 3 20:16:47 2006
40	@@ -40,7 +40,7 @@
41	#include <JLib/Util/JTypes.h>
42	#include <JLib/Util/JObject.h>
43	#include <JLib/Math/JMath.h>
44	-#include <SDL/SDL.h>
45	+#include <SDL.h>
46	#include <GL/gl.h>
47	#include <GL/glu.h>
48
49	diff -ru JLib/JLib/Graphics/JGLGrid.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h
50	--- JLib/JLib/Graphics/JGLGrid.h Tue Jan 3 13:42:42 2006
51	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h Tue Jan 3 20:16:47 2006
52	@@ -32,7 +32,7 @@
53	#include <JLib/Util/JTypes.h>
54	#include <JLib/Graphics/JDrawable.h>
55	#include <JLib/Graphics/JGLColor.h>
56	-#include <SDL/SDL.h>
57	+#include <SDL.h>
58	#include <GL/gl.h>
59
60	class JGLGrid : public JDrawable
61	diff -ru JLib/JLib/Graphics/JGLLight.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h
62	--- JLib/JLib/Graphics/JGLLight.h Tue Jan 3 13:42:42 2006
63	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h Tue Jan 3 20:16:47 2006
64	@@ -33,7 +33,7 @@
65	#include <JLib/Util/JObject.h>
66	#include <JLib/Math/JVector.h>
67	#include <JLib/Graphics/JGLColor.h>
68	-#include <SDL/SDL.h>
69	+#include <SDL.h>
70	#include <GL/gl.h>
71
72	// Clase para gestión de texturas
73	diff -ru JLib/JLib/Graphics/JGLText.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h
74	--- JLib/JLib/Graphics/JGLText.h Tue Jan 3 13:42:42 2006
75	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h Tue Jan 3 20:16:47 2006
76	@@ -33,7 +33,7 @@
77	#include <JLib/Util/JString.h>
78	#include <JLib/Util/JGLApp.h>
79	#include <JLib/Graphics/JFont.h>
80	-#include <SDL/SDL.h>
81	+#include <SDL.h>
82	#include <GL/gl.h>
83
84	class JGLText : public JObject
85	diff -ru JLib/JLib/Graphics/JGLVector.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h
86	--- JLib/JLib/Graphics/JGLVector.h Tue Jan 3 13:42:42 2006
87	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h Tue Jan 3 20:16:47 2006
88	@@ -32,7 +32,7 @@
89
90	#include <JLib/Util/JTypes.h>
91	#include <JLib/Math/JVector.h>
92	-#include <SDL/SDL.h>
93	+#include <SDL.h>
94	#include <GL/gl.h>
95
96	/** Vector en pantalla para OpenGL.
97	diff -ru JLib/JLib/Graphics/JImage.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h
98	--- JLib/JLib/Graphics/JImage.h Tue Jan 3 13:42:42 2006
99	+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h Tue Jan 3 20:16:47 2006
100	@@ -36,8 +36,8 @@
101	#include <JLib/Graphics/JDrawable.h>
102	#include <JLib/Util/JString.h>
103	#include <JLib/Util/JUtil.h>
104	-#include <SDL/SDL.h>
105	-#include <SDL/SDL_image.h>
106	+#include <SDL.h>
107	+#include <SDL_image.h>
108
109	/** Imágen genérica.
110	*/
111	diff -ru JLib/JLib/Sound/JChunk.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h
112	--- JLib/JLib/Sound/JChunk.h Tue Jan 3 13:42:42 2006
113	+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h Tue Jan 3 20:16:47 2006
114	@@ -30,7 +30,7 @@
115	#ifndef _JCHUNK_INCLUDED
116	#define _JCHUNK_INCLUDED
117
118	-#include <SDL/SDL_mixer.h>
119	+#include <SDL_mixer.h>
120
121	/** Encapsula una muestra de audio.
122	*/
123	diff -ru JLib/JLib/Sound/JMixer.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h
124	--- JLib/JLib/Sound/JMixer.h Tue Jan 3 13:42:42 2006
125	+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h Tue Jan 3 20:16:47 2006
126	@@ -30,7 +30,7 @@
127	#ifndef _JMIXER_INCLUDED
128	#define _JMIXER_INCLUDED
129
130	-#include <SDL/SDL_mixer.h>
131	+#include <SDL_mixer.h>
132	#include <JLib/Util/JTypes.h>
133	#include <JLib/Sound/JChunk.h>
134
135	diff -ru JLib/JLib/Util/JApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h
136	--- JLib/JLib/Util/JApp.h Tue Jan 3 13:42:42 2006
137	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h Tue Jan 3 20:16:47 2006
138	@@ -35,7 +35,7 @@
139	#include <JLib/Util/JTimer.h>
140	#include <JLib/Graphics/JFont.h>
141	#include <JLib/Sound/JMixer.h>
142	-#include <SDL/SDL.h>
143	+#include <SDL.h>
144	#include <stdio.h>
145	#include <stdlib.h>
146
147	@@ -53,7 +53,7 @@
148	* <pre>
149	*
150	* #include <JLib/Util/JApp.h>
151	- * #include <SDL/SDL_keysym.h>
152	+ * #include <SDL_keysym.h>
153	* #include <stdio.h>
154	*
155	* class MyApp : public JApp
156	diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp
157	--- JLib/JLib/Util/JFS.cpp Tue Jan 3 13:42:42 2006
158	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp Wed Jan 4 01:20:59 2006
159	@@ -886,8 +886,8 @@	4	@@ -886,8 +886,8 @@
160	s32 n, k;	5	s32 n, k;
161		6
Lines 167-350 Link Here
167		12
168	if (n < 0)	13	if (n < 0)
169	{	14	{
170	diff -ru JLib/JLib/Util/JFile.h holotz-castle-1.3.7-src/JLib/JLib/Util/JFile.h	15	diff -ru JLib/Makefile holotz-castle-1.3.8-src/JLib/Makefile
171	--- JLib/JLib/Util/JFile.h Tue Jan 3 13:42:42 2006	16	--- JLib/Makefile Fri Jan 20 08:59:37 2006
172	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JFile.h Tue Jan 3 20:16:47 2006	17	+++ holotz-castle-1.3.8-src/JLib/Makefile Mon Jan 23 21:20:53 2006
173	@@ -38,7 +38,7 @@	18	@@ -19,7 +19,7 @@
174	#include <sys/types.h>
175	#include <sys/stat.h>
176	#include <stdarg.h>
177	-#include <SDL/SDL_endian.h>
178	+#include <SDL_endian.h>
179	#include <zlib.h>
180	#include <JLib/Util/JCompatibility.h>
181
182	diff -ru JLib/JLib/Util/JGLApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h
183	--- JLib/JLib/Util/JGLApp.h Tue Jan 3 13:42:42 2006
184	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h Tue Jan 3 20:16:47 2006
185	@@ -35,7 +35,7 @@
186	#endif
187
188	#include <JLib/Util/JApp.h>
189	-#include <SDL/SDL.h>
190	+#include <SDL.h>
191	#include <GL/gl.h>
192	#include <GL/glu.h>
193	#include <stdio.h>
194	diff -ru JLib/JLib/Util/JRW.h holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h
195	--- JLib/JLib/Util/JRW.h Tue Jan 3 13:42:42 2006
196	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h Tue Jan 3 20:16:47 2006
197	@@ -33,8 +33,8 @@
198	#include <JLib/Util/JTypes.h>
199	#include <JLib/Util/JObject.h>
200	#include <zlib.h>
201	-#include <SDL/SDL.h>
202	-#include <SDL/SDL_endian.h>
203	+#include <SDL.h>
204	+#include <SDL_endian.h>
205
206	/** Encapsulates a SDL_RWops object. It's a simple wrapper.
207	*/
208	diff -ru JLib/JLib/Util/JTextUtil.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h
209	--- JLib/JLib/Util/JTextUtil.h Tue Jan 3 13:42:42 2006
210	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h Tue Jan 3 20:16:47 2006
211	@@ -30,7 +30,7 @@
212	#define _JTEXTUTIL_INCLUDED
213
214	#include <JLib/Util/JTypes.h>
215	-#include <SDL/SDL.h>
216	+#include <SDL.h>
217	//#include <JLib/Graphics/JText.h>
218
219	// Crea una superficie en formato RGBA de 32 bits con los caracteres en
220	diff -ru JLib/JLib/Util/JThread.h holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h
221	--- JLib/JLib/Util/JThread.h Tue Jan 3 13:42:42 2006
222	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h Tue Jan 3 20:16:47 2006
223	@@ -31,8 +31,8 @@
224	#define _JTHREAD_INCLUDED
225
226	#include <JLib/Util/JTypes.h>
227	-#include <SDL/SDL.h>
228	-#include <SDL/SDL_thread.h>
229	+#include <SDL.h>
230	+#include <SDL_thread.h>
231
232	/** Base class for threads.
233	*/
234	diff -ru JLib/JLib/Util/JTimer.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h
235	--- JLib/JLib/Util/JTimer.h Tue Jan 3 13:42:42 2006
236	+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h Tue Jan 3 20:16:47 2006
237	@@ -32,7 +32,7 @@
238
239	#include <JLib/Util/JTypes.h>
240	#include <JLib/Util/JObject.h>
241	-#include <SDL/SDL.h>
242	+#include <SDL.h>
243	#include <sys/types.h>
244	#include <sys/timeb.h>
245	#include <time.h>
246	diff -ru JLib/Makefile holotz-castle-1.3.7-src/JLib/Makefile
247	--- JLib/Makefile Tue Jan 3 13:42:42 2006
248	+++ holotz-castle-1.3.7-src/JLib/Makefile Wed Jan 4 12:23:28 2006
249	@@ -15,8 +15,8 @@
250	$(UTIL)/JApp.o $(UTIL)/JFS.o $(UTIL)/JThread.o $(UTIL)/JRW.o $(MATH)/J2DPolygon.o
251
252	# Definir -D_JLIB_DEBUG para hacer debug de JLib. Compilar el programa a debugear también con este flag
253	-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
254	-LDFLAGS=-L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
255	+CFLAGS=`sdl11-config --cflags` -I/usr/X11R6/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
256	+LDFLAGS=`sdl11-config --libs` -L/usr/X11R6/lib -L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
257
258	all: libJLib
259
260	diff -ru Makefile holotz-castle-1.3.7-src/Makefile
261	--- Makefile Tue Jan 3 13:42:45 2006
262	+++ holotz-castle-1.3.7-src/Makefile Wed Jan 4 12:11:52 2006
263	@@ -5,11 +5,11 @@
264	HC_VERSION=1.3.7
265
266	all:
267	- make -C src
268	+ $(MAKE) -C src
269
270	distro-src:
271	find . -iname "*~" -exec 'rm' '{}' ';';
272	- make clean;
273	+ $(MAKE) clean;
274	rm -rf _DISTRO/SRC;
275	mkdir -p _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src;\
276	cp -RL [^_h]* _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src &&\
277	@@ -20,7 +20,7 @@
278
279	distro-i486:
280	find . -iname "*~" -exec 'rm' '{}' ';';
281	- make I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
282	+ $(MAKE) I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
283	rm -rf _DISTRO/I486;
284	mkdir -p _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486;
285	cp -RL holotz-castle holotz-castle-editor res HCedHome doc LICENSE.txt MANUAL* _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486 &&\
286	@@ -39,11 +39,11 @@
287	rm -rf _DISTRO/WIN32/HC;
288
289	install:
290	- make -C src install
291	+ $(MAKE) -C src install
292
293	uninstall:
294	- make -C src uninstall;
295	+ $(MAKE) -C src uninstall;
296
297	.PHONY: clean
298	clean:
299	- make -C src clean
300	+ $(MAKE) -C src clean
301	diff -ru src/Makefile holotz-castle-1.3.7-src/src/Makefile
302	--- src/Makefile Tue Jan 3 13:42:45 2006
303	+++ holotz-castle-1.3.7-src/src/Makefile Wed Jan 4 13:29:39 2006
304	@@ -18,10 +18,10 @@
305	# comenta estas líneas si no quieres instalar el juego (y descomenta las de arriba)
306
307	ifndef I486_BUILD
308	-HC_BASE = /usr/share/games/holotz-castle/
309	+#HC_BASE = /usr/share/games/holotz-castle/
310	HC_DATA = $(HC_BASE)game/
311	HCED_DATA = $(HC_BASE)editor/
312	-HC_BIN_DIR = /usr/local/bin/
313	+#HC_BIN_DIR = /usr/local/bin/
314	endif	19	endif
315		20
316	DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"	21	# Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
317	@@ -38,22 +38,22 @@	22	-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
		23	+CFLAGS=-I$(X11BASE)/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
		24
		25	# Sample LDFLAGS for applications
		26	# LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
		27	diff -ru src/Makefile holotz-castle-1.3.8-src/src/Makefile
		28	--- src/Makefile Fri Jan 20 08:59:38 2006
		29	+++ holotz-castle-1.3.8-src/src/Makefile Mon Jan 23 21:12:33 2006
		30	@@ -42,8 +42,8 @@
318		31
319	# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo tambiÃ©n en el Makefile de JLib.	32	# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo tambiÃ©n en el Makefile de JLib.
320	# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.	33	# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
321	-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c $(shell sdl-config --cflags)	34	-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
322	-LDFLAGS=-L/usr/X11R6/lib -ffast-math -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf	35	-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
323	+CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c $(shell sdl11-config --cflags)	36	+CFLAGS=-I$(X11BASE)/include -I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
324	+LDFLAGS=-L/usr/X11R6/lib `sdl11-config --libs ` -ffast-math -lSDL_image -lSDL_mixer -lSDL_ttf	37	+LDFLAGS=-L$(X11BASE)/lib -L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
325		38
326	JLib:
327	- make -C ../JLib;
328	+ $(MAKE) -C ../JLib;
329
330	%.o: %.cpp %.h
331	g++ $(CFLAGS) $(DEFINES) $< -o $@
332
333	HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
334	- g++ $(LDFLAGS) $? -o $@;\
335	+ g++ $(LDFLAGS) $? -o $@ -l compat;\
336	mv HC ../holotz-castle
337		39
338	# HCed (Holotz's Castle editor).	40	JLib:
339	HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
340	- g++ $(LDFLAGS) $? -o $@;\
341	+ g++ $(LDFLAGS) $? -o $@ -lcompat;\
342	mv HCed ../holotz-castle-editor
343
344	install:
345	@@ -75,4 +75,4 @@
346	rm -f ../holotz-castle;\
347	rm -f ../holotz-castle-editor;\
348	rm -f *\.o;\
349	- make -C ../JLib clean
350	+ $(MAKE) -C ../JLib clean