initial cmake support (let's see if this is better suited than autoconf)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1717 b956fd51-792f-4845-bead-9b4dfca2ff2c

24 files changed, 88 insertions, 269 deletions

diff --git a/cmake/src/lib/CMakeLists.txt b/cmake/src/lib/CMakeLists.txt
new file mode 100644
index 00000000..1136fd8f
--- /dev/null
+++ b/cmake/src/lib/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_subdirectory(bass)
+add_subdirectory(collections)
+add_subdirectory(ctypes)
+add_subdirectory(ffmpeg)
+add_subdirectory(fft)
+add_subdirectory(FreeImage)
+add_subdirectory(freetype)
+add_subdirectory(JEDI-SDL)
+add_subdirectory(libpng)
+add_subdirectory(midi)
+add_subdirectory(portaudio)
+add_subdirectory(portmixer)
+add_subdirectory(projectM)
+add_subdirectory(samplerate)
+add_subdirectory(SQLite)
+add_subdirectory(zlib)
diff --git a/cmake/src/lib/FreeImage/CMakeLists.txt b/cmake/src/lib/FreeImage/CMakeLists.txt
new file mode 100644
index 00000000..873880f6
--- /dev/null
+++ b/cmake/src/lib/FreeImage/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(freeimage
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/JEDI-SDL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/CMakeLists.txt
new file mode 100644
index 00000000..1b5bfdc9
--- /dev/null
+++ b/cmake/src/lib/JEDI-SDL/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(SDL)
+add_subdirectory(SDL_Image)
+add_subdirectory(OpenGL)
diff --git a/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt
new file mode 100644
index 00000000..2b33cdcf
--- /dev/null
+++ b/cmake/src/lib/JEDI-SDL/OpenGL/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(opengl
+  UNITS Pas/*.pas
+)
diff --git a/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt
new file mode 100644
index 00000000..8bd0ae65
--- /dev/null
+++ b/cmake/src/lib/JEDI-SDL/SDL/CMakeLists.txt
@@ -0,0 +1,4 @@
+pascal_add_package(sdl
+  UNITS Pas/*.pas
+  INCLUDES Pas/*.inc
+)
diff --git a/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt b/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt
new file mode 100644
index 00000000..fb34d8ce
--- /dev/null
+++ b/cmake/src/lib/JEDI-SDL/SDL_Image/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(sdl_image
+  UNITS Pas/*.pas
+)
diff --git a/cmake/src/lib/SQLite/CMakeLists.txt b/cmake/src/lib/SQLite/CMakeLists.txt
new file mode 100644
index 00000000..4a4378b3
--- /dev/null
+++ b/cmake/src/lib/SQLite/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(sqlite3
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/bass/CMakeLists.txt b/cmake/src/lib/bass/CMakeLists.txt
new file mode 100644
index 00000000..c55d0629
--- /dev/null
+++ b/cmake/src/lib/bass/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(bass
+  UNITS delphi/*.pas
+)
diff --git a/cmake/src/lib/collections/CMakeLists.txt b/cmake/src/lib/collections/CMakeLists.txt
new file mode 100644
index 00000000..02480e70
--- /dev/null
+++ b/cmake/src/lib/collections/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(collections
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/ctypes/CMakeLists.txt b/cmake/src/lib/ctypes/CMakeLists.txt
new file mode 100644
index 00000000..64827ee2
--- /dev/null
+++ b/cmake/src/lib/ctypes/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(ctypes
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/ffmpeg/CMakeLists.txt b/cmake/src/lib/ffmpeg/CMakeLists.txt
new file mode 100644
index 00000000..0db265ca
--- /dev/null
+++ b/cmake/src/lib/ffmpeg/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(ffmpeg
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/fft/CMakeLists.txt b/cmake/src/lib/fft/CMakeLists.txt
new file mode 100644
index 00000000..f38808c8
--- /dev/null
+++ b/cmake/src/lib/fft/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(fft
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/freetype/CMakeLists.txt b/cmake/src/lib/freetype/CMakeLists.txt
new file mode 100644
index 00000000..772834f4
--- /dev/null
+++ b/cmake/src/lib/freetype/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(freetype
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/libpng/CMakeLists.txt b/cmake/src/lib/libpng/CMakeLists.txt
new file mode 100644
index 00000000..9e5aaf52
--- /dev/null
+++ b/cmake/src/lib/libpng/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(png
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/midi/CMakeLists.txt b/cmake/src/lib/midi/CMakeLists.txt
new file mode 100644
index 00000000..f3265e44
--- /dev/null
+++ b/cmake/src/lib/midi/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(midi
+  UNITS *.pas *.PAS
+)
diff --git a/cmake/src/lib/portaudio/CMakeLists.txt b/cmake/src/lib/portaudio/CMakeLists.txt
new file mode 100644
index 00000000..3e18119b
--- /dev/null
+++ b/cmake/src/lib/portaudio/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(portaudio
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/portmixer/CMakeLists.txt b/cmake/src/lib/portmixer/CMakeLists.txt
new file mode 100644
index 00000000..74a4b437
--- /dev/null
+++ b/cmake/src/lib/portmixer/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(portmixer
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/projectM/CMakeLists.txt b/cmake/src/lib/projectM/CMakeLists.txt
new file mode 100644
index 00000000..3598d0b5
--- /dev/null
+++ b/cmake/src/lib/projectM/CMakeLists.txt
@@ -0,0 +1,6 @@
+pascal_add_package(projectm
+  UNITS *.pas
+  INCLUDES *.inc
+  OBJECT_DIRS ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_subdirectory(cwrapper)
diff --git a/cmake/src/lib/projectM/cwrapper/CMakeLists.txt b/cmake/src/lib/projectM/cwrapper/CMakeLists.txt
new file mode 100644
index 00000000..90880cd8
--- /dev/null
+++ b/cmake/src/lib/projectM/cwrapper/CMakeLists.txt
@@ -0,0 +1,11 @@
+if(libprojectM_USE_CWRAPPER)
+  include_directories(${libprojectM_INCLUDEDIR}/libprojectM)
+  add_definitions(-DPROJECTM_VERSION_INT=${libprojectM_VERSION_INT})
+
+  set(projectm_cwrapper_srcs projectM-cwrapper.cpp)
+  if(WIN32)
+    add_library(projectM-cwrapper SHARED ${projectm_cwrapper_srcs})
+  else(WIN32)
+    add_library(projectM-cwrapper STATIC ${projectm_cwrapper_srcs})
+  endif(WIN32)
+endif(libprojectM_USE_CWRAPPER)
diff --git a/cmake/src/lib/projectM/cwrapper/Makefile.in b/cmake/src/lib/projectM/cwrapper/Makefile.in
deleted file mode 100644
index fef3b80b..00000000
--- a/cmake/src/lib/projectM/cwrapper/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#################################################
-# projectM C-wrapper
-# @configure_input@
-#################################################
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-OBJECTS	= projectM-cwrapper.o
-LIBRARY = libprojectM-cwrapper.a
-
-CXX      = @CXX@
-CXXFLAGS += @CXXFLAGS@
-INCLUDES = -I@libprojectM_INCLUDEDIR@/libprojectM
-DEFINES  = -DPROJECTM_VERSION_INT=@libprojectM_VERSION_INT@
-RANLIB   = @RANLIB@
-
-.PHONY: all clean distclean strip
-
-all : $(LIBRARY)
-
-$(LIBRARY): $(OBJECTS)
-	ar ruv $(LIBRARY) $(OBJECTS)
-	$(RANLIB) $(LIBRARY)
-
-%.o : %.cpp
-	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $(<) -o $@
-
-clean : 
-	rm -f $(LIBRARY)
-	rm -f $(OBJECTS)
-
-distclean: clean
-	rm -rf Makefile
-
-strip : 
-	strip $(LIBRARY)
-	$(RANLIB) $(LIBRARY)
-
diff --git a/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.sln b/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.sln
deleted file mode 100644
index e05f79a3..00000000
--- a/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projectM-cwrapper", "projectM-cwrapper.vcproj", "{8E653284-12F3-4A90-9D0D-4195557051F7}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{8E653284-12F3-4A90-9D0D-4195557051F7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8E653284-12F3-4A90-9D0D-4195557051F7}.Debug|Win32.Build.0 = Debug|Win32

-		{8E653284-12F3-4A90-9D0D-4195557051F7}.Release|Win32.ActiveCfg = Release|Win32

-		{8E653284-12F3-4A90-9D0D-4195557051F7}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj b/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj
deleted file mode 100644
index 94e848d7..00000000
--- a/cmake/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="projectM-cwrapper"

-	ProjectGUID="{8E653284-12F3-4A90-9D0D-4195557051F7}"

-	RootNamespace="projectMcwrapper"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libprojectM.lib"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM\Debug&quot;"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"

-				ExceptionHandling="1"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="libprojectM.lib"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM\Release&quot;"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Quelldateien"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\projectM-cwrapper.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Headerdateien"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath=".\projectM-cwrapper.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Ressourcendateien"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cmake/src/lib/samplerate/CMakeLists.txt b/cmake/src/lib/samplerate/CMakeLists.txt
new file mode 100644
index 00000000..adea4fe1
--- /dev/null
+++ b/cmake/src/lib/samplerate/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(samplerate
+  UNITS *.pas
+)
diff --git a/cmake/src/lib/zlib/CMakeLists.txt b/cmake/src/lib/zlib/CMakeLists.txt
new file mode 100644
index 00000000..66b42b7e
--- /dev/null
+++ b/cmake/src/lib/zlib/CMakeLists.txt
@@ -0,0 +1,3 @@
+pascal_add_package(zlib
+  UNITS *.pas
+)