From 01122969a4c2eb25ac75544b5a315fd711b9ea55 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 11 Apr 2011 09:01:10 -0700 Subject: [PATCH 1/2] A much improved gitignore. --- .gitignore | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 07ed7069..813dc5ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,27 @@ -build/* \ No newline at end of file +*~ +\#* +.\#* +*.tmproj +tmtags +tags +.DS_Store +*.swp +*.o +*.orig + +Makefile +CMakeCache.txt +CMakeFiles +cmake_install.cmake +install_manifest.txt +build/ + +*.user +*.suo +*.sdf +*.ncb +*.pch +*.pdb +[Bb]uild[Ll]og.* +[Tt]est[Rr]esult* +[Tt]humbs.db From 942fc3e77acb3992a120c243bc0ca5d32989c611 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 11 Apr 2011 15:35:18 -0400 Subject: [PATCH 2/2] Fix a pfSurface explosion if the Bink SDK is enabled --- .../Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt index cead1f95..99101a6e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt @@ -3,6 +3,11 @@ include_directories(../../NucleusLib) include_directories(../../NucleusLib/inc) include_directories(../../PubUtilLib) +if(Bink_SDK_AVAILABLE) + include_directories(${Bink_INCLUDE_DIR}) +endif() +include_directories(${DirectX_INCLUDE_DIR}) + if(WIN32) add_definitions(-DWIN32) endif(WIN32)