mirror of
https://github.com/SFML/SFML.git
synced 2024-11-28 22:31:09 +08:00
Synchronized with trunk
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1232 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
commit
fc22927874
@ -44,6 +44,11 @@
|
||||
// MacOS
|
||||
#define CSFML_SYSTEM_MACOS
|
||||
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
|
||||
// FreeBSD
|
||||
#define CSFML_SYSTEM_FREEBSD
|
||||
|
||||
#else
|
||||
|
||||
// Unsupported system
|
||||
|
@ -40,7 +40,7 @@
|
||||
// Windows defines a void* handle (HWND)
|
||||
typedef void* sfWindowHandle;
|
||||
|
||||
#elif defined(CSFML_SYSTEM_LINUX)
|
||||
#elif defined(CSFML_SYSTEM_LINUX) || defined(CSFML_SYSTEM_FREEBSD)
|
||||
|
||||
// Unix - X11 defines an unsigned integer handle (Window)
|
||||
typedef unsigned long sfWindowHandle;
|
||||
|
@ -14,18 +14,23 @@ export DESTINCDIR = $(DESTDIR)/include
|
||||
all: csfml-system csfml-window csfml-network csfml-graphics csfml-audio
|
||||
|
||||
csfml-system:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./System && $(MAKE))
|
||||
|
||||
csfml-window:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Window && $(MAKE))
|
||||
|
||||
csfml-network:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Network && $(MAKE))
|
||||
|
||||
csfml-graphics:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Graphics && $(MAKE))
|
||||
|
||||
csfml-audio:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Audio && $(MAKE))
|
||||
|
||||
.PHONY: clean mrproper
|
||||
|
@ -13,39 +13,51 @@ export EXECPATH = ../bin
|
||||
all: ftp-sample opengl-sample pong-sample post-fx-sample qt-sample sockets-sample sound-sample sound_capture-sample voip-sample window-sample wxwidgets-sample X11-sample
|
||||
|
||||
ftp-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./ftp && $(MAKE))
|
||||
|
||||
opengl-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./opengl && $(MAKE))
|
||||
|
||||
pong-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./pong && $(MAKE))
|
||||
|
||||
post-fx-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./post-fx && $(MAKE))
|
||||
|
||||
qt-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./qt && $(MAKE))
|
||||
|
||||
sockets-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./sockets && $(MAKE))
|
||||
|
||||
sound-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./sound && $(MAKE))
|
||||
|
||||
sound_capture-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./sound_capture && $(MAKE))
|
||||
|
||||
voip-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./voip && $(MAKE))
|
||||
|
||||
window-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./window && $(MAKE))
|
||||
|
||||
wxwidgets-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./wxwidgets && $(MAKE))
|
||||
|
||||
X11-sample:
|
||||
@(mkdir -p bin)
|
||||
@(cd ./X11 && $(MAKE))
|
||||
|
||||
.PHONY: clean mrproper
|
||||
|
@ -34,18 +34,23 @@ export DESTINCDIR = $(DESTDIR)/include
|
||||
all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
|
||||
|
||||
sfml-system:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./System && $(MAKE))
|
||||
|
||||
sfml-window:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Window && $(MAKE))
|
||||
|
||||
sfml-network:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Network && $(MAKE))
|
||||
|
||||
sfml-graphics:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Graphics && $(MAKE))
|
||||
|
||||
sfml-audio:
|
||||
@(mkdir -p ../../lib)
|
||||
@(cd ./Audio && $(MAKE))
|
||||
|
||||
.PHONY: clean mrproper
|
||||
|
Loading…
Reference in New Issue
Block a user