Commented out vld as it seems to be specific to a version of VC. Will add it back later

This commit is contained in:
urioxis 2011-02-24 12:34:31 +00:00
parent f1bd82508d
commit 29f4f116fc
18 changed files with 27 additions and 27 deletions

View File

@ -41,15 +41,15 @@ if(WIN32 AND NOT UNIX)
)
include_directories ("${musikCube_SOURCE_DIR}/src/3rdparty/boost")
endif (Boost_FOUND)
set (VLD_ROOT_DIR ${musikCube_SOURCE_DIR}/src/3rdparty/lib)
set (VLD_INCLUDE_DIR ${musikCube_SOURCE_DIR}/src/3rdparty/include)
find_package(vld REQUIRED)
if (VLD_FOUND)
message(STATUS "VLD Found")
link_directories(${VLD_LIBRARIES_DIR})
else (VLD_FOUND)
message(STATUS "VLD not found")
endif (VLD_FOUND)
#set (VLD_ROOT_DIR ${musikCube_SOURCE_DIR}/src/3rdparty/lib)
#set (VLD_INCLUDE_DIR ${musikCube_SOURCE_DIR}/src/3rdparty/include)
#find_package(vld REQUIRED)
#if (VLD_FOUND)
# message(STATUS "VLD Found")
# link_directories(${VLD_LIBRARIES_DIR})
#else (VLD_FOUND)
# message(STATUS "VLD not found")
#endif (VLD_FOUND)
add_definitions (
-DUNICODE
)

View File

@ -7,4 +7,4 @@
#include <core/config.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -7,4 +7,4 @@
#include <core/config.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -39,4 +39,4 @@
#include <core/config.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -7,4 +7,4 @@
#include <core/config.h>
#include <shlwapi.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -39,4 +39,4 @@
#include <core/config.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -8,5 +8,5 @@
#include <core/config.h>
#ifdef WIN32
#include "vld/vld.h"
//#include "vld/vld.h"
#endif //WIN32

View File

@ -27,4 +27,4 @@
// Windows Header Files:
#include <windows.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -10,4 +10,4 @@
#include <shlwapi.h>
#include <math.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -11,5 +11,5 @@
#ifdef WIN32
#include <shlwapi.h>
#include "vld/vld.h"
//#include "vld/vld.h"
#endif //WIN32

View File

@ -7,4 +7,4 @@
#include <core/config.h>
#include "vld/vld.h"
//#include "vld/vld.h"

View File

@ -28,5 +28,5 @@
// Windows Header Files:
#include <windows.h>
#include "vld/vld.h"
//#include "vld/vld.h"
#endif //WIN32

View File

@ -45,7 +45,7 @@
#include <ks.h>
#include <ksmedia.h>
#include "vld/vld.h"
//#include "vld/vld.h"
#else

View File

@ -48,7 +48,7 @@
//////////////////////////////////////////////////////////////////////////////
#pragma warning (disable : 4996 4018 4482)
#include "vld/vld.h"
//#include "vld/vld.h"
#include <core/config.h>
#include <core/LibraryFactory.h>

View File

@ -46,7 +46,7 @@
//////////////////////////////////////////////////////////////////////////////
#pragma warning (disable : 4996 4018 4482)
#include "vld/vld.h"
//#include "vld/vld.h"
#include <core/config.h>

View File

@ -13,8 +13,8 @@ set (SQUARE_HEADERS
stdafx.h
)
SOURCE_GROUP (source FILES ${SQUARE_SRCS})
SOURCE_GROUP (headers FILES ${SQUARE_HEADERS})
SOURCE_GROUP ("Source Files" FILES ${SQUARE_SRCS})
SOURCE_GROUP ("Header Files" FILES ${SQUARE_HEADERS})
add_executable(square ${SQUARE_SRCS} ${SQUARE_HEADERS})
target_link_libraries(square ${musikCube_LINK_LIBS} musik)

View File

@ -9,7 +9,7 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
#include <vld/vld.h>
//#include <vld/vld.h>
#include "config.h"

View File

@ -62,6 +62,6 @@
//////////////////////////////////////////////////////////////////////////////
#include "vld/vld.h"
//#include "vld/vld.h"
//////////////////////////////////////////////////////////////////////////////