From ca5f0996cd93cfb7ed8d1cb6ad517a9af7f4341d Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 8 May 2009 15:56:46 +0000 Subject: 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 --- cmake/src/lib/projectM/cwrapper/CMakeLists.txt | 11 ++ cmake/src/lib/projectM/cwrapper/Makefile.in | 41 ---- .../lib/projectM/cwrapper/projectM-cwrapper.sln | 20 -- .../lib/projectM/cwrapper/projectM-cwrapper.vcproj | 208 --------------------- 4 files changed, 11 insertions(+), 269 deletions(-) create mode 100644 cmake/src/lib/projectM/cwrapper/CMakeLists.txt delete mode 100644 cmake/src/lib/projectM/cwrapper/Makefile.in delete mode 100644 cmake/src/lib/projectM/cwrapper/projectM-cwrapper.sln delete mode 100644 cmake/src/lib/projectM/cwrapper/projectM-cwrapper.vcproj (limited to 'cmake/src/lib/projectM/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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3