|
 |
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.app.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanApp: Libs/libclanApp.so Libs/libclanApp.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installApp: clanApp
|
|
|
87bfab1 |
- @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanApp.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_LIB_App = Libs/Intermediate/clanapp.o
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -13,7 +13,7 @@ INC_PREFIX = @includedir@
|
|
|
753c03c |
BIN_PREFIX = @bindir@
|
|
|
753c03c |
TARGET_PREFIX = @libdir@/ClanLib
|
|
|
753c03c |
MAN_PREFIX = @mandir@
|
|
|
753c03c |
-
|
|
|
753c03c |
+DESTDIR =
|
|
|
753c03c |
INCLUDE_DIRS = -I Sources @x_includes@ @extra_includes@
|
|
|
753c03c |
|
|
|
753c03c |
COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS -D__int64=int64_t @DEFS@ @comp_mode@ @directfb_cflags@
|
|
|
87bfab1 |
@@ -34,19 +34,19 @@ Libs/Intermediate/%.o : %.cpp
|
|
|
753c03c |
@echo "Compiling $<"
|
|
|
753c03c |
-@if [ ! -d Libs ]; then mkdir Libs; fi
|
|
|
753c03c |
-@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
|
|
|
753c03c |
- @$(CXX_COMMAND) $< -o $@
|
|
|
753c03c |
+ $(CXX_COMMAND) $< -o $@
|
|
|
753c03c |
|
|
|
753c03c |
Libs/Intermediate/%.o : %.c
|
|
|
753c03c |
@echo "Compiling $<"
|
|
|
753c03c |
-@if [ ! -d Libs ]; then mkdir Libs; fi
|
|
|
753c03c |
-@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
|
|
|
753c03c |
- @$(CC_COMMAND) -c $< -o $@
|
|
|
753c03c |
+ $(CC_COMMAND) -c $< -o $@
|
|
|
753c03c |
|
|
|
753c03c |
Libs/Intermediate/%.o : %.s
|
|
|
753c03c |
@echo "Assembling $<"
|
|
|
753c03c |
-@if [ ! -d Libs ]; then mkdir Libs; fi
|
|
|
753c03c |
-@if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
|
|
|
753c03c |
- @$(AS_COMMAND) $< -o $@
|
|
|
753c03c |
+ $(AS_COMMAND) $< -o $@
|
|
|
753c03c |
|
|
|
753c03c |
build_info:
|
|
|
753c03c |
@echo Compile command .cpp = $(CXX_COMMAND)
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.core.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,21 +5,21 @@
|
|
|
753c03c |
clanCore: build_info Libs/libclanCore.so Libs/libclanCore.a
|
|
|
753c03c |
|
|
|
753c03c |
installCore: clanCore
|
|
|
753c03c |
- @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/core.h $(INC_PREFIX)/ClanLib/core.h
|
|
|
753c03c |
- @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
|
|
|
753c03c |
- @install -m 0644 Sources/API/efence.h $(INC_PREFIX)/ClanLib/efence.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanCore.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
|
|
|
753c03c |
- @install -d $(BIN_PREFIX) $(MAN_PREFIX)/man1/
|
|
|
753c03c |
- @install Setup/Unix/clanlib-config $(BIN_PREFIX)
|
|
|
753c03c |
- @install Setup/Unix/clanlib-config.1 $(MAN_PREFIX)/man1/
|
|
|
753c03c |
+ @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/core.h $(DESTDIR)$(INC_PREFIX)/ClanLib/core.h
|
|
|
753c03c |
+ @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
|
|
|
753c03c |
+ @install -m 0644 Sources/API/efence.h $(DESTDIR)$(INC_PREFIX)/ClanLib/efence.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanCore.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(BIN_PREFIX) $(DESTDIR)$(MAN_PREFIX)/man1/
|
|
|
753c03c |
+ @install Setup/Unix/clanlib-config $(DESTDIR)$(BIN_PREFIX)
|
|
|
753c03c |
+ @install Setup/Unix/clanlib-config.1 $(DESTDIR)$(MAN_PREFIX)/man1/
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_CORE_GENERIC = \
|
|
|
753c03c |
Libs/Intermediate/cl_assert.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.display.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -4,14 +4,14 @@
|
|
|
753c03c |
clanDisplay: Libs/libclanDisplay.so Libs/libclanDisplay.a
|
|
|
753c03c |
|
|
|
753c03c |
installDisplay: clanDisplay
|
|
|
753c03c |
- @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/Display -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/display.h $(INC_PREFIX)/ClanLib/display.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanDisplay.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanDisplay.so
|
|
|
753c03c |
+ @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/Display -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/display.h $(DESTDIR)$(INC_PREFIX)/ClanLib/display.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanDisplay.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_DISP_GENERIC = \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
753c03c |
clanGL: Libs/libclanGL.so Libs/libclanGL.a
|
|
|
753c03c |
|
|
|
753c03c |
installGL: clanGL
|
|
|
753c03c |
- @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/GL -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/gl.h $(INC_PREFIX)/ClanLib/gl.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanGL.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so
|
|
|
753c03c |
+ @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/GL -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/gl.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gl.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanGL.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_LIB_GL = Libs/Intermediate/texture_gl.o \
|
|
|
753c03c |
Libs/Intermediate/opengl.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installGUI: clanGUI
|
|
|
87bfab1 |
- @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanGUI.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_LIB_GUI = \
|
|
|
87bfab1 |
Libs/Intermediate/button.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
|
|
|
87bfab1 |
|
|
|
87bfab1 |
installJPEG: clanJPEG
|
|
|
87bfab1 |
- @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
|
|
|
87bfab1 |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanJPEG.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
|
|
|
87bfab1 |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
|
|
|
87bfab1 |
|
|
|
87bfab1 |
|
|
|
87bfab1 |
OBJF_LIB_JPEG = \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
753c03c |
clanLua: Libs/libclanLua.so Libs/libclanLua.a
|
|
|
753c03c |
|
|
|
753c03c |
installLua: clanLua
|
|
|
753c03c |
- @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/Lua -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/lua.h $(INC_PREFIX)/ClanLib/lua.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanLua.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so
|
|
|
753c03c |
+ @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/Lua -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/lua.h $(DESTDIR)$(INC_PREFIX)/ClanLib/lua.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanLua.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_LIB_LUA = \
|
|
|
753c03c |
Libs/Intermediate/clanbindings.o
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
753c03c |
clanMikMod: Libs/libclanMikMod.so Libs/libclanMikMod.a
|
|
|
753c03c |
|
|
|
753c03c |
installMikMod: clanMikMod
|
|
|
753c03c |
- @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/MikMod -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/mikmod.h $(INC_PREFIX)/ClanLib/mikmod.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanMikMod.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so
|
|
|
753c03c |
+ @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/MikMod -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/mikmod.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mikmod.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanMikMod.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_LIB_MIKMOD = \
|
|
|
753c03c |
Libs/Intermediate/resourcetype_module.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
753c03c |
clanMPEG: Libs/libclanMPEG.so Libs/libclanMPEG.a
|
|
|
753c03c |
|
|
|
753c03c |
installMPEG: clanMPEG
|
|
|
753c03c |
- @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @for i in `find Sources/API/MPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/mpeg.h $(INC_PREFIX)/ClanLib/mpeg.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
753c03c |
- @install Libs/libclanMPEG.a $(LIB_PREFIX)
|
|
|
753c03c |
- @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
- @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so
|
|
|
753c03c |
+ @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @for i in `find Sources/API/MPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/mpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mpeg.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @install Libs/libclanMPEG.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
753c03c |
+ @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
|
|
|
753c03c |
+ @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so
|
|
|
753c03c |
|
|
|
753c03c |
OBJF_LIB_MPEG = \
|
|
|
753c03c |
Libs/Intermediate/mpeg_soundprovider.o
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.network.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installNetwork: clanNetwork
|
|
|
87bfab1 |
- @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanNetwork.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
|
|
|
87bfab1 |
Libs/Intermediate/browse_client.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.png.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installPNG: clanPNG
|
|
|
87bfab1 |
- @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
|
|
|
87bfab1 |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanPNG.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
|
|
|
87bfab1 |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
|
|
|
87bfab1 |
|
|
|
87bfab1 |
|
|
|
87bfab1 |
OBJF_LIB_PNG = \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.signals.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo 2001-03-17 00:56:33.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -5,6 +5,6 @@
|
|
|
87bfab1 |
clanSignals:
|
|
|
87bfab1 |
|
|
|
87bfab1 |
installSignals: clanSignals
|
|
|
87bfab1 |
- @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
|
|
|
87bfab1 |
|
|
|
87bfab1 |
installSmallJPEG: clanSmallJPEG
|
|
|
87bfab1 |
- @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
- @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
|
|
|
753c03c |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
753c03c |
+ @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
|
|
|
753c03c |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_LIB_SMALLJPEG = \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -4,14 +4,14 @@
|
|
|
87bfab1 |
clanSound: Libs/libclanSound.so Libs/libclanSound.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installSound: clanSound
|
|
|
87bfab1 |
- @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
|
|
|
87bfab1 |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanSound.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
|
|
|
87bfab1 |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_SOUND_GENERIC = \
|
|
|
87bfab1 |
Libs/Intermediate/sound.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
|
|
|
753c03c |
|
|
|
87bfab1 |
installTTF: clanTTF
|
|
|
87bfab1 |
- @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
|
|
|
87bfab1 |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanTTF.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
|
|
|
87bfab1 |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
87bfab1 |
OBJF_LIB_TTF = \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -5,14 +5,14 @@
|
|
|
87bfab1 |
clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
|
|
|
87bfab1 |
|
|
|
87bfab1 |
installVorbis: clanVorbis
|
|
|
87bfab1 |
- @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
- @install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
|
|
|
87bfab1 |
- @install -d $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
|
|
|
87bfab1 |
- @install Libs/libclanVorbis.a $(LIB_PREFIX)
|
|
|
87bfab1 |
- @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
- @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
|
|
|
87bfab1 |
+ @install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
|
|
|
87bfab1 |
+ @install -d $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
|
|
|
87bfab1 |
+ @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
|
|
|
87bfab1 |
+ @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
|
|
|
87bfab1 |
|
|
|
87bfab1 |
OBJF_LIB_VORBIS = \
|
|
|
87bfab1 |
Libs/Intermediate/vorbis_soundprovider_generic.o \
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -23,7 +23,11 @@
|
|
|
753c03c |
|
|
|
753c03c |
#include <string>
|
|
|
753c03c |
#include <stack>
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdio>
|
|
|
753c03c |
+#else
|
|
|
753c03c |
#include <stdio.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
//: Inputsource reading from file.
|
|
|
87bfab1 |
class CL_InputSource_File : public CL_InputSource
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,7 +22,11 @@
|
|
|
87bfab1 |
#include "outputsource.h"
|
|
|
753c03c |
|
|
|
753c03c |
#include <string>
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdio>
|
|
|
753c03c |
+#else
|
|
|
753c03c |
#include <stdio.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
//: Outputsource writing to file.
|
|
|
87bfab1 |
class CL_OutputSource_File : public CL_OutputSource
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo ClanLib-0.6.5/Sources/API/Core/Math/math.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo 2001-09-06 20:52:05.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Core/Math/math.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -16,7 +16,11 @@
|
|
|
87bfab1 |
#ifndef header_math
|
|
|
87bfab1 |
#define header_math
|
|
|
753c03c |
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cmath>
|
|
|
753c03c |
+#else
|
|
|
87bfab1 |
#include <math.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
#ifndef PI
|
|
|
87bfab1 |
#ifndef M_PI
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo 2001-09-22 17:52:11.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -81,7 +81,7 @@ public:
|
|
|
87bfab1 |
static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
|
|
|
753c03c |
|
|
|
87bfab1 |
//: Writes an info statements on the specified channel.
|
|
|
87bfab1 |
- //: Don't callthis one directly, instead use the cl_info macro.
|
|
|
87bfab1 |
+ //: Don't call this one directly, instead use the cl_info macro.
|
|
|
87bfab1 |
//: For example: cl_info(info_network, "MyClass::my_funx - Hello World.");
|
|
|
87bfab1 |
//- channel - Channel to use. (Use the ErrorChannels enum's)
|
|
|
87bfab1 |
//- text - text to print.
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo ClanLib-0.6.5/Sources/API/Core/System/clanstring.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo 2002-02-20 09:06:28.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -21,11 +21,19 @@
|
|
|
753c03c |
|
|
|
87bfab1 |
#include <string>
|
|
|
753c03c |
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
753c03c |
+#include <cstdlib>
|
|
|
87bfab1 |
+#include <cstring>
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
753c03c |
+#else
|
|
|
87bfab1 |
#include <stdio.h>
|
|
|
753c03c |
#include <stdlib.h>
|
|
|
87bfab1 |
#include <string.h>
|
|
|
87bfab1 |
-#include <iostream>
|
|
|
87bfab1 |
#include <stdio.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
+
|
|
|
87bfab1 |
+#include <iostream>
|
|
|
753c03c |
|
|
|
753c03c |
#ifndef WIN32
|
|
|
87bfab1 |
#include <cctype>
|
|
|
87bfab1 |
@@ -53,7 +61,8 @@ extern char *fcvt (double, int, int *, i
|
|
|
87bfab1 |
#include "../Resources/resource_manager.h"
|
|
|
87bfab1 |
#include "error.h"
|
|
|
753c03c |
|
|
|
87bfab1 |
-using namespace std;
|
|
|
87bfab1 |
+//this should *never* appear in a header
|
|
|
87bfab1 |
+//using namespace std;
|
|
|
753c03c |
|
|
|
87bfab1 |
//: Clan String Class
|
|
|
87bfab1 |
class CL_String
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo 2001-11-01 14:56:50.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -167,24 +167,24 @@ public:
|
|
|
753c03c |
case 15:
|
|
|
753c03c |
case 16:
|
|
|
753c03c |
{
|
|
|
753c03c |
- unsigned short *ptr =
|
|
|
753c03c |
- (unsigned short *) m_provider->get_data();
|
|
|
753c03c |
+ unsigned char *ptr =
|
|
|
753c03c |
+ (unsigned char *) m_provider->get_data();
|
|
|
753c03c |
|
|
|
753c03c |
for (int x=0; x
|
|
|
753c03c |
{
|
|
|
753c03c |
- dest[x] = (unsigned char) (ptr[x+y*width]&255);
|
|
|
753c03c |
+ dest[x] = ptr[(x+y*width)*2];
|
|
|
753c03c |
}
|
|
|
753c03c |
}
|
|
|
753c03c |
return;
|
|
|
753c03c |
|
|
|
753c03c |
case 32:
|
|
|
753c03c |
{
|
|
|
753c03c |
- unsigned int *ptr =
|
|
|
753c03c |
- (unsigned int *) m_provider->get_data();
|
|
|
753c03c |
+ unsigned char *ptr =
|
|
|
753c03c |
+ (unsigned char *) m_provider->get_data();
|
|
|
753c03c |
|
|
|
753c03c |
for (int x=0; x
|
|
|
753c03c |
{
|
|
|
753c03c |
- dest[x] = (unsigned char) (ptr[x+y*width]&255);
|
|
|
753c03c |
+ dest[x] = ptr[(x+y*width)*4];
|
|
|
753c03c |
}
|
|
|
753c03c |
}
|
|
|
753c03c |
return;
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo ClanLib-0.6.5/Sources/API/GUI/component_options.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo 2002-02-20 08:47:11.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/GUI/component_options.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -23,7 +23,12 @@
|
|
|
87bfab1 |
#include "../Core/System/error.h"
|
|
|
87bfab1 |
#include <map>
|
|
|
753c03c |
#include <string>
|
|
|
87bfab1 |
+
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdio>
|
|
|
753c03c |
+#else
|
|
|
753c03c |
#include <stdio.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
#ifdef WIN32
|
|
|
87bfab1 |
#define snprintf _snprintf
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo ClanLib-0.6.5/Sources/API/GUI/gui_manager.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo 2002-01-30 14:17:16.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -19,7 +19,11 @@
|
|
|
87bfab1 |
#ifndef header_gui_manager
|
|
|
87bfab1 |
#define header_gui_manager
|
|
|
753c03c |
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstddef>
|
|
|
753c03c |
+#else
|
|
|
87bfab1 |
#include <stddef.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
#include "component.h"
|
|
|
753c03c |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo 2001-12-11 21:44:20.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,7 +22,12 @@
|
|
|
87bfab1 |
#ifndef header_streamed_mikmod_sample
|
|
|
87bfab1 |
#define header_streamed_mikmod_sample
|
|
|
753c03c |
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
753c03c |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
753c03c |
+#endif
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
#include "../core.h"
|
|
|
87bfab1 |
#include "../Sound/stream_soundprovider.h"
|
|
|
87bfab1 |
#include "../Sound/soundbuffer.h"
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Signals/slot.h.foo ClanLib-0.6.5/Sources/API/Signals/slot.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Signals/slot.h.foo 2001-09-22 17:52:17.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Signals/slot.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
753c03c |
@@ -20,7 +20,11 @@
|
|
|
753c03c |
#define header_slot
|
|
|
753c03c |
|
|
|
753c03c |
#include "slot_generic.h"
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdlib>
|
|
|
753c03c |
+#else
|
|
|
753c03c |
#include <stdlib.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
753c03c |
//: Slot class
|
|
|
753c03c |
class CL_Slot
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo 2001-12-11 21:44:21.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,7 +22,12 @@
|
|
|
87bfab1 |
#ifndef header_streamed_raw_sample
|
|
|
87bfab1 |
#define header_streamed_raw_sample
|
|
|
753c03c |
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
#include "../stream_soundprovider.h"
|
|
|
87bfab1 |
#include "../soundbuffer.h"
|
|
|
753c03c |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo 2001-12-11 21:44:21.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,7 +22,12 @@
|
|
|
87bfab1 |
#ifndef header_streamed_wave_sample
|
|
|
87bfab1 |
#define header_streamed_wave_sample
|
|
|
753c03c |
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
#include "../../Core/IOData/inputsource.h"
|
|
|
87bfab1 |
#include "../stream_soundprovider.h"
|
|
|
87bfab1 |
#include "../soundbuffer.h"
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Sound/sound.h.foo ClanLib-0.6.5/Sources/API/Sound/sound.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Sound/sound.h.foo 2002-06-13 16:43:17.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Sound/sound.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -20,7 +20,11 @@
|
|
|
87bfab1 |
#define header_sound
|
|
|
753c03c |
|
|
|
87bfab1 |
#include <vector>
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
#include "soundbuffer.h"
|
|
|
87bfab1 |
#include "../Core/System/cl_assert.h"
|
|
|
753c03c |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo 2001-09-22 17:52:18.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -19,7 +19,11 @@
|
|
|
87bfab1 |
#ifndef header_soundbuffer_session
|
|
|
87bfab1 |
#define header_soundbuffer_session
|
|
|
753c03c |
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdlib>
|
|
|
753c03c |
+#else
|
|
|
753c03c |
#include <stdlib.h>
|
|
|
753c03c |
+#endif
|
|
|
753c03c |
|
|
|
87bfab1 |
class CL_SoundCard;
|
|
|
87bfab1 |
class CL_SoundPlayBackDesc;
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/API/efence.h.foo ClanLib-0.6.5/Sources/API/efence.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/API/efence.h.foo 2001-09-06 20:52:04.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/API/efence.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -23,7 +23,7 @@
|
|
|
753c03c |
|
|
|
87bfab1 |
#ifndef WIN32
|
|
|
87bfab1 |
|
|
|
87bfab1 |
-#include <stdlib.h>
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
87bfab1 |
|
|
|
87bfab1 |
void *operator new(size_t size)
|
|
|
753c03c |
{
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo 2002-01-10 11:23:30.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -13,6 +13,7 @@
|
|
|
87bfab1 |
------------------------------------------------------------------------
|
|
|
87bfab1 |
*/
|
|
|
753c03c |
|
|
|
87bfab1 |
+#include <cassert>
|
|
|
87bfab1 |
#include <API/Core/System/error.h>
|
|
|
87bfab1 |
#include <iostream>
|
|
|
87bfab1 |
#include <libgen.h>
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo 2002-01-10 00:45:16.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -21,7 +21,11 @@
|
|
|
87bfab1 |
#include <sys/types.h>
|
|
|
87bfab1 |
#include <sys/stat.h>
|
|
|
87bfab1 |
#include <dirent.h>
|
|
|
87bfab1 |
-#include <stdio.h>
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
#include <unistd.h>
|
|
|
753c03c |
|
|
|
87bfab1 |
class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo 2000-05-03 20:29:00.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -435,6 +435,7 @@ private:
|
|
|
753c03c |
|
|
|
87bfab1 |
class FileConfig : public BaseConfig
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
+protected: class ConfigGroup; /* prototype for later definition */
|
|
|
87bfab1 |
public:
|
|
|
87bfab1 |
/** @name Constructors and destructor */
|
|
|
87bfab1 |
//@{
|
|
|
87bfab1 |
@@ -527,7 +528,6 @@ public:
|
|
|
753c03c |
|
|
|
87bfab1 |
//protected: --- if FileConfig::ConfigEntry is not public, functions in
|
|
|
87bfab1 |
// ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
|
|
|
87bfab1 |
- class ConfigGroup;
|
|
|
87bfab1 |
class ConfigEntry
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
private:
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -17,12 +17,12 @@
|
|
|
87bfab1 |
#ifdef USE_DIRECTFB
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
87bfab1 |
-#include <stdlib.h>
|
|
|
87bfab1 |
-#include <stdio.h>
|
|
|
87bfab1 |
-#include <string.h>
|
|
|
87bfab1 |
-#include <iostream>
|
|
|
753c03c |
+#include <cstdlib>
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
87bfab1 |
+#include <cstring>
|
|
|
87bfab1 |
+#include <cmath>
|
|
|
753c03c |
|
|
|
87bfab1 |
-#include <math.h>
|
|
|
87bfab1 |
+#include <iostream>
|
|
|
753c03c |
|
|
|
87bfab1 |
#include <API/Display/Display/mousecursor.h>
|
|
|
87bfab1 |
#include <API/Display/Display/cliprect.h>
|
|
|
87bfab1 |
@@ -177,7 +177,7 @@ void CL_DirectFB_DisplayCard::set_videom
|
|
|
87bfab1 |
|
|
|
87bfab1 |
if (fullscreen)
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
- cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
|
|
|
87bfab1 |
+ std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
|
|
|
87bfab1 |
dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
|
|
|
87bfab1 |
ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -104,7 +104,7 @@ unsigned int CL_Target_DirectFB::get_num
|
|
|
753c03c |
|
|
|
753c03c |
unsigned int CL_Target_DirectFB::get_width() const
|
|
|
753c03c |
{
|
|
|
753c03c |
- unsigned int width = 0;
|
|
|
753c03c |
+ int width = 0;
|
|
|
753c03c |
|
|
|
753c03c |
surface->GetSize (surface, &width, NULL);
|
|
|
753c03c |
|
|
|
87bfab1 |
@@ -113,7 +113,7 @@ unsigned int CL_Target_DirectFB::get_wid
|
|
|
753c03c |
|
|
|
753c03c |
unsigned int CL_Target_DirectFB::get_height() const
|
|
|
753c03c |
{
|
|
|
753c03c |
- unsigned int height = 0;
|
|
|
753c03c |
+ int height = 0;
|
|
|
753c03c |
|
|
|
753c03c |
surface->GetSize (surface, NULL, &height);
|
|
|
753c03c |
|
|
|
87bfab1 |
@@ -147,7 +147,7 @@ unsigned int CL_Target_DirectFB::get_red
|
|
|
753c03c |
{
|
|
|
753c03c |
case DSPF_A8:
|
|
|
753c03c |
return 0;
|
|
|
753c03c |
- case DSPF_RGB15:
|
|
|
753c03c |
+ case DSPF_ARGB1555:
|
|
|
753c03c |
return 0x007c00;
|
|
|
753c03c |
case DSPF_RGB16:
|
|
|
753c03c |
return 0x00f800;
|
|
|
87bfab1 |
@@ -170,7 +170,7 @@ unsigned int CL_Target_DirectFB::get_gre
|
|
|
753c03c |
{
|
|
|
753c03c |
case DSPF_A8:
|
|
|
753c03c |
return 0;
|
|
|
753c03c |
- case DSPF_RGB15:
|
|
|
753c03c |
+ case DSPF_ARGB1555:
|
|
|
753c03c |
return 0x0003e0;
|
|
|
753c03c |
case DSPF_RGB16:
|
|
|
753c03c |
return 0x0007e0;
|
|
|
87bfab1 |
@@ -193,7 +193,7 @@ unsigned int CL_Target_DirectFB::get_blu
|
|
|
753c03c |
{
|
|
|
753c03c |
case DSPF_A8:
|
|
|
753c03c |
return 0;
|
|
|
753c03c |
- case DSPF_RGB15:
|
|
|
753c03c |
+ case DSPF_ARGB1555:
|
|
|
753c03c |
case DSPF_RGB16:
|
|
|
753c03c |
return 0x00001f;
|
|
|
753c03c |
case DSPF_RGB24:
|
|
|
87bfab1 |
@@ -215,7 +215,7 @@ unsigned int CL_Target_DirectFB::get_alp
|
|
|
753c03c |
{
|
|
|
753c03c |
case DSPF_A8:
|
|
|
753c03c |
return 0xff;
|
|
|
753c03c |
- case DSPF_RGB15:
|
|
|
753c03c |
+ case DSPF_ARGB1555:
|
|
|
753c03c |
case DSPF_RGB16:
|
|
|
753c03c |
case DSPF_RGB24:
|
|
|
753c03c |
case DSPF_RGB32:
|
|
|
87bfab1 |
@@ -263,7 +263,7 @@ void CL_Target_DirectFB::Flip (DFBRegion
|
|
|
753c03c |
|
|
|
753c03c |
void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
|
|
|
753c03c |
{
|
|
|
753c03c |
- unsigned int width, height;
|
|
|
753c03c |
+ int width, height;
|
|
|
753c03c |
|
|
|
753c03c |
surface->GetSize (surface, &width, &height);
|
|
|
753c03c |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo 2001-09-02 19:33:37.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -107,14 +107,14 @@ public:
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
T a = alpha_data[x];
|
|
|
87bfab1 |
T destval = dst_data[x];
|
|
|
87bfab1 |
- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
|
|
|
87bfab1 |
- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
|
|
|
87bfab1 |
- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
|
|
|
87bfab1 |
+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
|
|
|
87bfab1 |
+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
|
|
|
87bfab1 |
+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
|
|
|
753c03c |
|
|
|
87bfab1 |
T amix =
|
|
|
87bfab1 |
- (r<
|
|
|
87bfab1 |
- (g<
|
|
|
87bfab1 |
- (b<
|
|
|
87bfab1 |
+ (r<<this->rstart) +
|
|
|
87bfab1 |
+ (g<<this->gstart) +
|
|
|
87bfab1 |
+ (b<<this->bstart);
|
|
|
753c03c |
|
|
|
87bfab1 |
dst_data[x] = amix + *(src_data++);
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
@@ -151,13 +151,13 @@ public:
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
T a = alpha_data[x];
|
|
|
87bfab1 |
T destval = dst_buf[x];
|
|
|
87bfab1 |
- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
|
|
|
87bfab1 |
- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
|
|
|
87bfab1 |
- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
|
|
|
87bfab1 |
+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
|
|
|
87bfab1 |
+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
|
|
|
87bfab1 |
+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
|
|
|
87bfab1 |
T amix =
|
|
|
87bfab1 |
- (r<
|
|
|
87bfab1 |
- (g<
|
|
|
87bfab1 |
- (b<
|
|
|
87bfab1 |
+ (r<<this->rstart) +
|
|
|
87bfab1 |
+ (g<<this->gstart) +
|
|
|
87bfab1 |
+ (b<<this->bstart);
|
|
|
87bfab1 |
dst_buf[x] = amix + *(src_data++);
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
memcpy(dst_data, dst_buf, sizeof(T)*rep);
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo 2001-09-02 04:24:43.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -278,7 +278,7 @@ void SubBlitter_Transparent<T>::blt_nocl
|
|
|
87bfab1 |
unsigned int dest_pitch = target->get_pitch();
|
|
|
87bfab1 |
|
|
|
87bfab1 |
unsigned char *dest = (unsigned char *) target->get_data();
|
|
|
87bfab1 |
- dest += x*sizeof(T) + (y-1)*dest_pitch;
|
|
|
87bfab1 |
+ dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
|
|
|
87bfab1 |
|
|
|
87bfab1 |
// T *dd;
|
|
|
87bfab1 |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo 2001-04-12 21:58:17.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -20,7 +20,11 @@
|
|
|
87bfab1 |
#define header_blitters
|
|
|
87bfab1 |
|
|
|
87bfab1 |
class CL_Target;
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdlib>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
#include "API/Display/Display/cliprect.h"
|
|
|
87bfab1 |
/*
|
|
|
87bfab1 |
#include "API/Display/Display/surfaceprovider.h"
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo 2002-02-18 23:47:37.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -713,13 +713,13 @@ void cl_fill_rect_opaque(
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
-
|
|
|
87bfab1 |
+ break;
|
|
|
87bfab1 |
case 2:
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
register unsigned short _color = (unsigned short) color;
|
|
|
87bfab1 |
int skip = dest_pitch - delta_x * 2;
|
|
|
87bfab1 |
// the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
|
|
|
87bfab1 |
- if ((_color & 0x00FF) != (_color & 0xFF00))
|
|
|
87bfab1 |
+ if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
for (unsigned int y = 0; y < delta_y; y++)
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
@@ -758,8 +758,8 @@ void cl_fill_rect_opaque(
|
|
|
87bfab1 |
for (unsigned int x = 0; x < delta_x; x++)
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
*(dest++) = color & 0x0000FF;
|
|
|
87bfab1 |
- *(dest++) = color & 0x00FF00;
|
|
|
87bfab1 |
- *(dest++) = color & 0xFF0000;
|
|
|
87bfab1 |
+ *(dest++) = (color & 0x00FF00) >> 8;
|
|
|
87bfab1 |
+ *(dest++) = (color & 0xFF0000) >> 16;
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
dest += skip;
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo 2001-03-06 16:09:19.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -153,15 +153,12 @@ unsigned int CL_Target_XImage_Std::get_h
|
|
|
753c03c |
|
|
|
87bfab1 |
unsigned int CL_Target_XImage_Std::get_pitch() const
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
- int bytes_per_pixel = (get_depth()+7)/8;
|
|
|
87bfab1 |
-
|
|
|
87bfab1 |
- return m_width*bytes_per_pixel;
|
|
|
87bfab1 |
+ return m_pitch;
|
|
|
87bfab1 |
}
|
|
|
87bfab1 |
|
|
|
87bfab1 |
unsigned int CL_Target_XImage_Std::get_depth() const
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
- int hack = (m_visual_info.bits_per_rgb+7)/8;
|
|
|
87bfab1 |
- return hack*8;
|
|
|
87bfab1 |
+ return m_depth;
|
|
|
87bfab1 |
}
|
|
|
753c03c |
|
|
|
87bfab1 |
unsigned int CL_Target_XImage_Std::get_red_mask() const
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo 2002-04-04 03:16:11.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -51,12 +51,32 @@ void CL_X11Resolution::set_mode(int widt
|
|
|
753c03c |
|
|
|
87bfab1 |
if (!mode_set) // save original mode
|
|
|
753c03c |
{
|
|
|
87bfab1 |
+ XF86VidModeModeLine l;
|
|
|
87bfab1 |
memset(&orig_mode, 0, sizeof(orig_mode));
|
|
|
87bfab1 |
memset(&orig_view, 0, sizeof(orig_view));
|
|
|
87bfab1 |
+ memset(&l, 0, sizeof(l));
|
|
|
753c03c |
|
|
|
87bfab1 |
// Get mode info. (missing XF86VidModeGetModeInfo)
|
|
|
87bfab1 |
- XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
|
|
|
87bfab1 |
- cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
|
|
|
87bfab1 |
+ // XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
|
|
|
87bfab1 |
+ // there is a problem with alignment on 64bit platforms
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
+ cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
+ // this should be ok on all platforms
|
|
|
87bfab1 |
+ orig_mode.hdisplay = l.hdisplay;
|
|
|
87bfab1 |
+ orig_mode.hsyncstart = l.hsyncstart;
|
|
|
87bfab1 |
+ orig_mode.hsyncend = l.hsyncend;
|
|
|
87bfab1 |
+ orig_mode.htotal = l.htotal;
|
|
|
87bfab1 |
+ orig_mode.hskew = l.hskew;
|
|
|
87bfab1 |
+ orig_mode.vdisplay = l.vdisplay;
|
|
|
87bfab1 |
+ orig_mode.vsyncstart = l.vsyncstart;
|
|
|
87bfab1 |
+ orig_mode.vsyncend = l.vsyncend;
|
|
|
87bfab1 |
+ orig_mode.vtotal = l.vtotal;
|
|
|
87bfab1 |
+ orig_mode.flags = l.flags;
|
|
|
87bfab1 |
+ orig_mode.privsize = l.privsize;
|
|
|
87bfab1 |
+ orig_mode.c_private = l.c_private;
|
|
|
87bfab1 |
|
|
|
87bfab1 |
// Get the viewport position.
|
|
|
87bfab1 |
cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo 2002-02-16 17:10:41.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -363,7 +363,8 @@ void CL_GLX_DisplayCard::keep_alive()
|
|
|
87bfab1 |
|
|
|
87bfab1 |
void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
|
|
|
753c03c |
{
|
|
|
87bfab1 |
- return glXGetProcAddressARB((GLubyte*)function_name.c_str());
|
|
|
87bfab1 |
+ return glXGetProcAddress(reinterpret_cast<GLubyte*>(
|
|
|
87bfab1 |
+ const_cast<char *>(function_name.c_str())));
|
|
|
87bfab1 |
}
|
|
|
753c03c |
|
|
|
753c03c |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo ClanLib-0.6.5/Sources/GUI/component_manager_generic.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo 2002-01-08 11:17:25.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -14,7 +14,11 @@
|
|
|
87bfab1 |
#include <string>
|
|
|
87bfab1 |
#include <stack>
|
|
|
87bfab1 |
#include <vector>
|
|
|
753c03c |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdio>
|
|
|
753c03c |
+#else
|
|
|
87bfab1 |
#include <stdio.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
|
|
|
87bfab1 |
#include "API/GUI/component_manager.h"
|
|
|
87bfab1 |
#include "API/GUI/stylemanager.h"
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo 2001-09-08 21:12:52.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -23,7 +23,12 @@
|
|
|
87bfab1 |
#define XMD_H
|
|
|
87bfab1 |
#endif
|
|
|
87bfab1 |
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
753c03c |
+#include <cstdio>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdio.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
extern "C"
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
#include <jpeglib.h>
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo 2001-11-01 21:27:57.000000000 +0100
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -20,18 +20,19 @@
|
|
|
87bfab1 |
|
|
|
87bfab1 |
#ifdef WIN32
|
|
|
87bfab1 |
#include <windows.h>
|
|
|
87bfab1 |
+ #include <string.h>
|
|
|
87bfab1 |
#else
|
|
|
87bfab1 |
+ #include <cstring>
|
|
|
87bfab1 |
+ #include <cerrno>
|
|
|
87bfab1 |
#include <sys/time.h>
|
|
|
87bfab1 |
#include <sys/types.h>
|
|
|
87bfab1 |
#include <sys/socket.h>
|
|
|
87bfab1 |
#include <arpa/inet.h>
|
|
|
87bfab1 |
#include <netinet/in.h>
|
|
|
87bfab1 |
#include <unistd.h>
|
|
|
87bfab1 |
- #include <errno.h>
|
|
|
87bfab1 |
#include <fcntl.h>
|
|
|
87bfab1 |
#endif
|
|
|
87bfab1 |
|
|
|
87bfab1 |
-#include <string.h>
|
|
|
87bfab1 |
#include <list>
|
|
|
87bfab1 |
#include <queue>
|
|
|
87bfab1 |
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo 2001-09-08 21:24:20.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -20,14 +20,20 @@
|
|
|
87bfab1 |
#ifndef header_network_delivery_pipe
|
|
|
87bfab1 |
#define header_network_delivery_pipe
|
|
|
87bfab1 |
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cerrno>
|
|
|
87bfab1 |
+#include <cstring>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
+#include <errno.h>
|
|
|
87bfab1 |
+#include <string.h>
|
|
|
753c03c |
+#endif
|
|
|
87bfab1 |
+
|
|
|
87bfab1 |
#include <sys/time.h>
|
|
|
87bfab1 |
#include <sys/types.h>
|
|
|
87bfab1 |
#include <sys/socket.h>
|
|
|
87bfab1 |
#include <arpa/inet.h>
|
|
|
87bfab1 |
#include <netinet/in.h>
|
|
|
753c03c |
#include <unistd.h>
|
|
|
87bfab1 |
-#include <errno.h>
|
|
|
87bfab1 |
-#include <string.h>
|
|
|
87bfab1 |
#include <list>
|
|
|
753c03c |
|
|
|
87bfab1 |
#include "Network/Generic/network_delivery_impl.h"
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo 2001-04-20 14:54:18.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,6 +22,15 @@
|
|
|
87bfab1 |
#ifndef MAIN_H
|
|
|
87bfab1 |
#define MAIN_H
|
|
|
87bfab1 |
|
|
|
87bfab1 |
+#ifndef WIN32
|
|
|
87bfab1 |
+#include <cstdlib>
|
|
|
87bfab1 |
+#include <cstdio>
|
|
|
87bfab1 |
+#include <cmath>
|
|
|
87bfab1 |
+#include <cstring>
|
|
|
87bfab1 |
+#include <cctype>
|
|
|
87bfab1 |
+#include <csetjmp>
|
|
|
87bfab1 |
+#include <cassert>
|
|
|
87bfab1 |
+#else
|
|
|
87bfab1 |
#include <stdlib.h>
|
|
|
87bfab1 |
#include <stdio.h>
|
|
|
87bfab1 |
#include <math.h>
|
|
|
87bfab1 |
@@ -29,6 +38,7 @@
|
|
|
87bfab1 |
#include <ctype.h>
|
|
|
87bfab1 |
#include <setjmp.h>
|
|
|
87bfab1 |
#include <assert.h>
|
|
|
87bfab1 |
+#endif
|
|
|
87bfab1 |
|
|
|
87bfab1 |
typedef signed char schar; /* 8 bits */
|
|
|
87bfab1 |
typedef unsigned char uchar; /* 8 bits */
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo 2002-08-14 15:58:29.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -27,6 +27,7 @@
|
|
|
87bfab1 |
#include "API/Core/System/error.h"
|
|
|
87bfab1 |
#include "API/Sound/SoundProviders/static_provider_raw.h"
|
|
|
87bfab1 |
#include "API/Sound/SoundProviders/static_provider_wave.h"
|
|
|
87bfab1 |
+#include "API/Core/IOData/cl_endian.h"
|
|
|
87bfab1 |
|
|
|
87bfab1 |
CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
|
|
|
87bfab1 |
{
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
|
|
|
87bfab1 |
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo 2002-08-14 16:00:13.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -22,6 +22,7 @@
|
|
|
87bfab1 |
|
|
|
87bfab1 |
#include "API/Core/System/cl_assert.h"
|
|
|
87bfab1 |
#include "API/Core/System/error.h"
|
|
|
87bfab1 |
+#include "API/Core/IOData/cl_endian.h"
|
|
|
87bfab1 |
#include "API/Core/IOData/inputsource.h"
|
|
|
87bfab1 |
#include "API/Core/IOData/inputsource_provider.h"
|
|
|
87bfab1 |
#include "API/Sound/SoundProviders/stream_provider_wave.h"
|
|
|
87bfab1 |
@@ -118,10 +119,13 @@ CL_Streamed_WaveSample_Session::CL_Strea
|
|
|
87bfab1 |
// cl_assert(!(memcmp(temp, "data", 4)));
|
|
|
87bfab1 |
|
|
|
87bfab1 |
sample_size = input->read_uint32();
|
|
|
87bfab1 |
+ SWAP_IF_BIG(format.nSamplesPerSec);
|
|
|
87bfab1 |
sample_freq = format.nSamplesPerSec;
|
|
|
87bfab1 |
|
|
|
87bfab1 |
+ SWAP_IF_BIG(format.nAvgBytesPerSec);
|
|
|
87bfab1 |
int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
|
|
|
87bfab1 |
|
|
|
87bfab1 |
+ SWAP_IF_BIG(format.nChannels);
|
|
|
87bfab1 |
if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
|
|
|
87bfab1 |
else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
|
|
|
87bfab1 |
else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
|
|
|
87bfab1 |
diff -up ClanLib-0.6.5/configure.in.foo ClanLib-0.6.5/configure.in
|
|
|
87bfab1 |
--- ClanLib-0.6.5/configure.in.foo 2008-09-07 13:39:25.000000000 +0200
|
|
|
87bfab1 |
+++ ClanLib-0.6.5/configure.in 2008-09-07 13:39:37.000000000 +0200
|
|
|
87bfab1 |
@@ -217,7 +217,7 @@ dnl CHECK_LIB(ggi,Setup/Tests/ggi.cpp, G
|
|
|
87bfab1 |
|
|
|
87bfab1 |
CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
|
|
|
87bfab1 |
CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
|
|
|
87bfab1 |
-CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
|
|
|
87bfab1 |
+CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
|
|
|
87bfab1 |
CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
|
|
|
87bfab1 |
for lib in lua40 lua; do
|
|
|
87bfab1 |
dnl setting back OLDLIBS is needed because of the break
|