Permalink
Browse files

Added support for the CMake build system

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1550 4e206d99-4929-0410-ac5d-dfc041789085
  • Loading branch information...
1 parent aa612ec commit a991fe8e4db5104133ff3cefd7ec8c38339dfeae @LaurentGomila LaurentGomila committed Aug 19, 2010
Showing with 2,085 additions and 7,032 deletions.
  1. +64 −0 CMakeLists.txt
  2. +10 −10 build/codeblocks/SFML.workspace
  3. +1 −0 build/codeblocks/sfml-audio.cbp
  4. +16 −16 build/make/Makefile
  5. +11 −11 build/vc2005/SFML.sln
  6. +8 −8 build/vc2005/sfml-audio.vcproj
  7. +4 −4 build/vc2005/sfml-graphics.vcproj
  8. +11 −11 build/vc2008/SFML.sln
  9. +8 −8 build/vc2008/sfml-audio.vcproj
  10. +4 −4 build/vc2008/sfml-graphics.vcproj
  11. +48 −0 cmake/Config.cmake
  12. +191 −0 cmake/Macros.cmake
  13. +62 −0 cmake/Modules/FindGLEW.cmake
  14. +29 −0 cmake/Modules/FindSndfile.cmake
  15. +50 −0 doc/CMakeLists.txt
  16. +0 −10 doc/SFML.htm
  17. +0 −384 doc/build/doxygen.css
  18. +9 −9 doc/{build/Doxyfile → doxyfile.in}
  19. +681 −0 doc/doxygen.css
  20. 0 doc/{build → }/footer.htm
  21. 0 doc/{build → }/header.htm
  22. BIN doc/{html → }/logo-bg.jpg
  23. BIN doc/{html → }/logo.jpg
  24. 0 doc/{build/Doxygen.hpp → mainpage.hpp}
  25. +16 −0 examples/CMakeLists.txt
  26. +14 −0 examples/X11/CMakeLists.txt
  27. 0 {samples → examples}/X11/X11.cpp
  28. +4 −4 {samples → examples}/build/codeblocks/ftp.cbp
  29. +4 −4 {samples → examples}/build/codeblocks/opengl.cbp
  30. +4 −4 {samples → examples}/build/codeblocks/pong.cbp
  31. +4 −4 {samples → examples}/build/codeblocks/shader.cbp
  32. +4 −4 {samples → examples}/build/codeblocks/sockets.cbp
  33. +9 −9 {samples → examples}/build/codeblocks/sound-capture.cbp
  34. +4 −4 {samples → examples}/build/codeblocks/sound.cbp
  35. +4 −4 {samples → examples}/build/codeblocks/voip.cbp
  36. +4 −4 {samples → examples}/build/codeblocks/win32.cbp
  37. +4 −4 {samples → examples}/build/codeblocks/window.cbp
  38. +15 −0 examples/build/make/Makefile
  39. +16 −16 {samples → examples}/build/make/Makefile.X11
  40. +16 −16 {samples → examples}/build/make/Makefile.ftp
  41. +16 −16 {samples → examples}/build/make/Makefile.opengl
  42. +16 −16 {samples → examples}/build/make/Makefile.pong
  43. +16 −16 {samples → examples}/build/make/Makefile.shader
  44. +16 −16 {samples → examples}/build/make/Makefile.sockets
  45. +16 −16 {samples → examples}/build/make/Makefile.sound
  46. +16 −16 {samples → examples}/build/make/Makefile.sound_capture
  47. +16 −16 {samples → examples}/build/make/Makefile.voip
  48. +16 −16 {samples → examples}/build/make/Makefile.window
  49. +4 −4 {samples → examples}/build/vc2005/ftp.vcproj
  50. +4 −4 {samples → examples}/build/vc2005/opengl.vcproj
  51. +4 −4 {samples → examples}/build/vc2005/pong.vcproj
  52. +4 −4 {samples → examples}/build/vc2005/shader.vcproj
  53. +4 −4 {samples → examples}/build/vc2005/sockets.vcproj
  54. +5 −5 {samples → examples}/build/vc2005/sound-capture.vcproj
  55. +4 −4 {samples → examples}/build/vc2005/sound.vcproj
  56. +4 −4 {samples → examples}/build/vc2005/voip.vcproj
  57. +4 −4 {samples → examples}/build/vc2005/win32.vcproj
  58. +4 −4 {samples → examples}/build/vc2005/window.vcproj
  59. +4 −4 {samples → examples}/build/vc2008/ftp.vcproj
  60. +5 −5 {samples → examples}/build/vc2008/opengl.vcproj
  61. +4 −4 {samples → examples}/build/vc2008/pong.vcproj
  62. +4 −4 {samples → examples}/build/vc2008/shader.vcproj
  63. +4 −4 {samples → examples}/build/vc2008/sockets.vcproj
  64. +5 −5 {samples → examples}/build/vc2008/sound-capture.vcproj
  65. +4 −4 {samples → examples}/build/vc2008/sound.vcproj
  66. +4 −4 {samples → examples}/build/vc2008/voip.vcproj
  67. +4 −4 {samples → examples}/build/vc2008/win32.vcproj
  68. +4 −4 {samples → examples}/build/vc2008/window.vcproj
  69. 0 {samples → examples}/build/xcode/opengl-Info.plist
  70. 0 {samples → examples}/build/xcode/pong-Info.plist
  71. 0 {samples → examples}/build/xcode/post-fx-Info.plist
  72. 0 {samples → examples}/build/xcode/samples.xcodeproj/project.pbxproj
  73. 0 {samples → examples}/build/xcode/window-Info.plist
  74. +10 −0 examples/ftp/CMakeLists.txt
  75. 0 {samples → examples}/ftp/Ftp.cpp
  76. +13 −0 examples/opengl/CMakeLists.txt
  77. +2 −3 {samples → examples}/opengl/OpenGL.cpp
  78. BIN {samples/bin/datas/opengl → examples/opengl/resources}/background.jpg
  79. BIN {samples/bin/datas/opengl → examples/opengl/resources}/texture.jpg
  80. +10 −0 examples/pong/CMakeLists.txt
  81. +6 −6 {samples → examples}/pong/Pong.cpp
  82. BIN {samples/bin/datas/pong → examples/pong/resources}/background.jpg
  83. BIN {samples/bin/datas/pong → examples/pong/resources}/ball.png
  84. BIN {samples/bin/datas/pong → examples/pong/resources}/ball.wav
  85. BIN {samples/bin/datas/pong → examples/pong/resources}/paddle_left.png
  86. BIN {samples/bin/datas/pong → examples/pong/resources}/paddle_right.png
  87. BIN {samples/bin/datas/pong → examples/pong/resources}/sansation.ttf
  88. +10 −0 examples/shader/CMakeLists.txt
  89. +11 −11 {samples → examples}/shader/Shader.cpp
  90. BIN {samples/bin/datas/shader → examples/shader/resources}/background.jpg
  91. 0 {samples/bin/datas/shader → examples/shader/resources}/blur.sfx
  92. 0 {samples/bin/datas/shader → examples/shader/resources}/colorize.sfx
  93. 0 {samples/bin/datas/shader → examples/shader/resources}/edge.sfx
  94. 0 {samples/bin/datas/shader → examples/shader/resources}/fisheye.sfx
  95. 0 {samples/bin/datas/shader → examples/shader/resources}/nothing.sfx
  96. 0 {samples/bin/datas/shader → examples/shader/resources}/pixelate.sfx
  97. BIN {samples/bin/datas/shader → examples/shader/resources}/sansation.ttf
  98. BIN {samples/bin/datas/shader → examples/shader/resources}/sprite.png
  99. BIN {samples/bin/datas/shader → examples/shader/resources}/wave.jpg
  100. 0 {samples/bin/datas/shader → examples/shader/resources}/wave.sfx
  101. +12 −0 examples/sockets/CMakeLists.txt
  102. 0 {samples → examples}/sockets/Sockets.cpp
  103. 0 {samples → examples}/sockets/TCP.cpp
  104. 0 {samples → examples}/sockets/UDP.cpp
  105. +10 −0 examples/sound/CMakeLists.txt
  106. +2 −2 {samples → examples}/sound/Sound.cpp
  107. BIN {samples/bin/datas/sound → examples/sound/resources}/canary.wav
  108. BIN {samples/bin/datas/sound → examples/sound/resources}/orchestral.ogg
  109. +10 −0 examples/sound_capture/CMakeLists.txt
  110. 0 {samples → examples}/sound_capture/SoundCapture.cpp
  111. +12 −0 examples/voip/CMakeLists.txt
  112. 0 {samples → examples}/voip/Client.cpp
  113. 0 {samples → examples}/voip/Server.cpp
  114. 0 {samples → examples}/voip/VoIP.cpp
  115. +10 −0 examples/win32/CMakeLists.txt
  116. +1 −1 {samples → examples}/win32/Win32.cpp
  117. BIN {samples/bin/datas/win32 → examples/win32/resources}/image1.jpg
  118. BIN {samples/bin/datas/win32 → examples/win32/resources}/image2.jpg
  119. +13 −0 examples/window/CMakeLists.txt
  120. 0 {samples → examples}/window/Window.cpp
  121. +0 −2,686 extlibs/headers/png/png.h
  122. +0 −1,510 extlibs/headers/png/pngconf.h
  123. +0 −416 extlibs/headers/png/zconf.h
  124. +0 −1,605 extlibs/headers/png/zlib.h
  125. BIN extlibs/libs-mingw/libpng.a
  126. BIN extlibs/{libs-vc2005 → libs-msvc}/OpenAL32.lib
  127. BIN extlibs/{libs-vc2005 → libs-msvc}/freetype.lib
  128. BIN extlibs/{libs-vc2005 → libs-msvc}/glew.lib
  129. BIN extlibs/{libs-vc2005 → libs-msvc}/jpeg.lib
  130. BIN extlibs/{libs-vc2005 → libs-msvc}/sndfile.lib
  131. BIN extlibs/libs-vc2005/png.lib
  132. +1 −3 license.txt
  133. BIN samples/bin/libsndfile-1.dll
  134. BIN samples/bin/openal32.dll
  135. +0 −17 samples/build/make/Makefile
  136. +2 −8 src/SFML/Audio/ALCheck.hpp
  137. +47 −0 src/SFML/Audio/CMakeLists.txt
  138. +35 −0 src/SFML/CMakeLists.txt
  139. +104 −0 src/SFML/Graphics/CMakeLists.txt
  140. +9 −0 src/SFML/Main/CMakeLists.txt
  141. +54 −0 src/SFML/Network/CMakeLists.txt
  142. +1 −1 src/SFML/Network/Ftp.cpp
  143. +77 −0 src/SFML/System/CMakeLists.txt
  144. +83 −0 src/SFML/Window/CMakeLists.txt
View
@@ -0,0 +1,64 @@
+
+cmake_minimum_required(VERSION 2.8)
+
+# set a default build type if none was provided
+# this has to be done before the project() instruction!
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build (Debug or Release)" FORCE)
+endif()
+
+# project name
+project(SFML)
+
+# include the configuration file
+include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
+
+# setup version numbers
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 0)
+
+# add the SFML header path
+include_directories(${CMAKE_SOURCE_DIR}/include)
+
+# add an option for choosing the build type (shared or static)
+set(BUILD_SHARED_LIBS TRUE CACHE BOOL "TRUE to build SFML as shared libraries, FALSE to build it as static libraries")
+
+# add an option for building the examples
+set(BUILD_EXAMPLES FALSE CACHE BOOL "TRUE to build the SFML examples, FALSE to ignore them")
+
+# add an option for building the API documentation
+set(BUILD_DOC FALSE CACHE BOOL "TRUE to generate the API documentation, FALSE to ignore it")
+
+# define SFML_DYNAMIC if the build type is set to 'shared'
+if(BUILD_SHARED_LIBS)
+ add_definitions(-DSFML_DYNAMIC)
+endif()
+
+# remove SL security warnings with Visual C++
+if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+endif()
+
+# disable the rpath stuff
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+
+# add the subdirectories
+add_subdirectory(src/SFML)
+if(BUILD_EXAMPLES)
+ add_subdirectory(examples)
+endif()
+if(BUILD_DOC)
+ add_subdirectory(doc)
+endif()
+
+# setup the install rules
+install(DIRECTORY include
+ DESTINATION .
+ COMPONENT devel
+ PATTERN ".svn" EXCLUDE)
+install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
+if(WINDOWS)
+ install(FILES extlibs/bin/libsndfile-1.dll DESTINATION bin)
+ install(FILES extlibs/bin/openal32.dll DESTINATION bin)
+endif()
@@ -7,15 +7,15 @@
<Project filename="sfml-graphics.cbp" />
<Project filename="sfml-audio.cbp" />
<Project filename="sfml-main.cbp" />
- <Project filename="..\..\samples\build\codeblocks\ftp.cbp" />
- <Project filename="..\..\samples\build\codeblocks\opengl.cbp" />
- <Project filename="..\..\samples\build\codeblocks\pong.cbp" />
- <Project filename="..\..\samples\build\codeblocks\shader.cbp" />
- <Project filename="..\..\samples\build\codeblocks\sockets.cbp" />
- <Project filename="..\..\samples\build\codeblocks\sound.cbp" />
- <Project filename="..\..\samples\build\codeblocks\sound-capture.cbp" />
- <Project filename="..\..\samples\build\codeblocks\voip.cbp" />
- <Project filename="..\..\samples\build\codeblocks\win32.cbp" />
- <Project filename="..\..\samples\build\codeblocks\window.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\ftp.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\opengl.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\pong.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\shader.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\sockets.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\sound.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\sound-capture.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\voip.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\win32.cbp" />
+ <Project filename="..\..\examples\build\codeblocks\window.cbp" />
</Workspace>
</CodeBlocks_workspace_file>
@@ -109,6 +109,7 @@
<Add directory="..\..\extlibs\headers" />
<Add directory="..\..\src" />
<Add directory="..\..\include" />
+ <Add directory="..\..\extlibs\headers\AL" />
</Compiler>
<Linker>
<Add option="-static-libgcc" />
View
@@ -1,34 +1,34 @@
export SRCROOT = ../../src/SFML
-export DESTDIR = /usr/local
-export DESTLIBDIR = $(DESTDIR)/lib
+export DESTDIR = /usr/local
+export DESTLIBDIR = $(DESTDIR)/lib
export DESTINCDIR = $(DESTDIR)/include
export DESTDBGDIR = $(DESTLIBDIR)/debug/$(DESTLIBDIR)
-export CC = gcc
-export CPP = g++
-export CFLAGS = -W -Wall -pedantic -g -O2 -DNDEBUG -I../../include -I../../src -fPIC
-export CFLAGSEXT = -I../../include -I../../src -g -O2 -DNDEBUG -fPIC
-export LDFLAGS = -shared
-export LIBPATH = ../../lib
+export CC = gcc
+export CPP = g++
+export CFLAGS = -W -Wall -pedantic -g -O2 -DNDEBUG -I../../include -I../../src -fPIC
+export CFLAGSEXT = -I../../include -I../../src -g -O2 -DNDEBUG -fPIC
+export LDFLAGS = -shared
+export LIBPATH = ../../lib
export VERSION = 2.0
-export CP = cp
-export LN = ln
-export LNFLAGS = -s -f
+export CP = cp
+export LN = ln
+export LNFLAGS = -s -f
export LIBS = system window graphics audio network
all: sfml
sfml: $(LIBS)
-samples:
- cd ../../samples/build/make && $(MAKE)
+examples:
+ cd ../../examples/build/make && $(MAKE)
$(LIBS):
mkdir -p $(LIBPATH)
$(MAKE) -f Makefile.$@
install:
- mkdir -p $(DESTLIBDIR)
- mkdir -p $(DESTINCDIR)
+ mkdir -p $(DESTLIBDIR)
+ mkdir -p $(DESTINCDIR)
mkdir -p $(DESTDBGDIR)
$(CP) -r ../../include/SFML/ $(DESTINCDIR)/
find $(DESTINCDIR)/SFML -name .svn -type d -print0 | xargs -0 /bin/rm -rf
@@ -44,7 +44,7 @@ clean mrproper:
$(MAKE) $@ -f Makefile.graphics
$(MAKE) $@ -f Makefile.audio
$(MAKE) $@ -f Makefile.network
- cd ../../samples/build/make && $(MAKE) $@
+ cd ../../examples/build/make && $(MAKE) $@
.PHONY: clean mrproper
View
@@ -26,53 +26,53 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfml-window", "sfml-window.
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl", "..\..\samples\build\vc2005\opengl.vcproj", "{4CD9A872-16EF-4C53-81FC-C7E77E782718}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl", "..\..\examples\build\vc2005\opengl.vcproj", "{4CD9A872-16EF-4C53-81FC-C7E77E782718}"
ProjectSection(ProjectDependencies) = postProject
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\samples\build\vc2005\sockets.vcproj", "{E6ED898F-218E-4467-8B1D-92E393283E1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\examples\build\vc2005\sockets.vcproj", "{E6ED898F-218E-4467-8B1D-92E393283E1B}"
ProjectSection(ProjectDependencies) = postProject
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "..\..\samples\build\vc2005\sound.vcproj", "{11E3764D-850E-4EDA-9823-F66383A11042}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "..\..\examples\build\vc2005\sound.vcproj", "{11E3764D-850E-4EDA-9823-F66383A11042}"
ProjectSection(ProjectDependencies) = postProject
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound-capture", "..\..\samples\build\vc2005\sound-capture.vcproj", "{34EBDA13-AFA3-4AD9-AB64-2B2D40E09573}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound-capture", "..\..\examples\build\vc2005\sound-capture.vcproj", "{34EBDA13-AFA3-4AD9-AB64-2B2D40E09573}"
ProjectSection(ProjectDependencies) = postProject
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "voip", "..\..\samples\build\vc2005\voip.vcproj", "{4B169017-FFDD-4588-9658-6F1C9ABC6495}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "voip", "..\..\examples\build\vc2005\voip.vcproj", "{4B169017-FFDD-4588-9658-6F1C9ABC6495}"
ProjectSection(ProjectDependencies) = postProject
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2} = {B1BDA469-E6A7-4AF7-BDF9-EDDD7AD979A2}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32", "..\..\samples\build\vc2005\win32.vcproj", "{303EC049-639D-4F9C-9F33-D4B7F702275B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32", "..\..\examples\build\vc2005\win32.vcproj", "{303EC049-639D-4F9C-9F33-D4B7F702275B}"
ProjectSection(ProjectDependencies) = postProject
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "window", "..\..\samples\build\vc2005\window.vcproj", "{11E9ABEF-17A5-4FF7-91E5-994F34172F68}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "window", "..\..\examples\build\vc2005\window.vcproj", "{11E9ABEF-17A5-4FF7-91E5-994F34172F68}"
ProjectSection(ProjectDependencies) = postProject
{2BD26A09-E1B6-42E2-A0D0-63987B76BB97} = {2BD26A09-E1B6-42E2-A0D0-63987B76BB97}
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pong", "..\..\samples\build\vc2005\pong.vcproj", "{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pong", "..\..\examples\build\vc2005\pong.vcproj", "{DDDE27DC-5568-43EE-BD0E-57C581F73EDE}"
ProjectSection(ProjectDependencies) = postProject
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
@@ -83,15 +83,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pong", "..\..\samples\build
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{C6D36691-1669-4189-AAB8-06C9932C2A45}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3EE136A0-C638-4989-BE5A-E4007221CA28}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{3EE136A0-C638-4989-BE5A-E4007221CA28}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp", "..\..\samples\build\vc2005\ftp.vcproj", "{7236920B-254C-43A3-9DC1-778B477226DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftp", "..\..\examples\build\vc2005\ftp.vcproj", "{7236920B-254C-43A3-9DC1-778B477226DF}"
ProjectSection(ProjectDependencies) = postProject
{C061A27D-7CA0-4179-9869-672FA04A86A8} = {C061A27D-7CA0-4179-9869-672FA04A86A8}
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader", "..\..\samples\build\vc2005\shader.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader", "..\..\examples\build\vc2005\shader.vcproj", "{E8B7727D-2308-4ADC-90AE-D3F46798447D}"
ProjectSection(ProjectDependencies) = postProject
{0F9CE5F0-4D89-4314-9147-8AAB1B8842ED} = {0F9CE5F0-4D89-4314-9147-8AAB1B8842ED}
{FA4620B1-393A-4719-9BB4-3BC8CAA70C4B} = {FA4620B1-393A-4719-9BB4-3BC8CAA70C4B}
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\AL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SFML_EXPORTS;SFML_DYNAMIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-vc2005\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\sndfile.lib&quot;"
+ AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -133,7 +133,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\AL&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;SFML_EXPORTS;SFML_DYNAMIC"
StringPooling="true"
RuntimeLibrary="2"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-vc2005\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\sndfile.lib&quot;"
+ AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -222,7 +222,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\AL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SFML_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-vc2005\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\sndfile.lib&quot;"
+ AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
/>
<Tool
@@ -296,7 +296,7 @@
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;"
+ AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\include&quot;;&quot;$(SolutionDir)..\..\src&quot;;&quot;$(SolutionDir)..\..\extlibs\headers&quot;;&quot;$(SolutionDir)..\..\extlibs\headers\AL&quot;"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;SFML_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -320,7 +320,7 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-vc2005\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\sndfile.lib&quot;"
+ AdditionalDependencies="&quot;$(SolutionDir)..\..\extlibs\libs-msvc\openal32.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\sndfile.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
/>
<Tool
@@ -71,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
+ AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -167,7 +167,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
+ AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -258,7 +258,7 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
+ AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s-d.lib"
AdditionalLibraryDirectories=""
/>
@@ -340,7 +340,7 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot;"
+ AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-msvc\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-msvc\jpeg.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-s.lib"
AdditionalLibraryDirectories=""
/>
Oops, something went wrong.

0 comments on commit a991fe8

Please sign in to comment.