Merge pull request #20 from Chachay/dev

Modify CMakeList and WinBuild for Changes at a284aa5 and 4f56678

contrib/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include_directories(${PYTHONHOME}/include)
 link_directories(${PYTHONHOME}/libs)
 
-add_definitions(-DPY_INCLUDE)
+add_definitions(-DMATPLOTLIBCPP_PYTHON_HEADER=Python.h)
 
 # message(STATUS "*** dump start cmake variables ***")
 # get_cmake_property(_variableNames VARIABLES)

contrib/README.md

@@ -12,8 +12,8 @@ changes break any of them.
 ### Configuring and Building Samples
 
 ```cmd
-> cd Win
-> Win\build_win.cmd
+> cd contrib
+> WinBuild.cmd
 ```
 
-The `build_win.cmd` will set up temporal ENV variables and build binaries in (matplotlib root)/examples with the Release configuration.
+The `WinBuild.cmd` will set up temporal ENV variables and build binaries in (matplotlib root)/examples with the Release configuration.

contrib/WinBuild.cmd

@@ -31,7 +31,7 @@ pushd build
 cmake -G"!CMAKE_GENERATOR!" ^
       -DPYTHONHOME:STRING=%PYTHONHOME%^
       -DCMAKE_BUILD_TYPE:STRING=%CMAKE_CONFIG% ^
-      ../../Win/
+      %~dp0
 cmake --build . --config %CMAKE_CONFIG%  
 
 pushd %CMAKE_CONFIG%  
@@ -39,7 +39,7 @@ if not EXIST platforms mkdir platforms
 if EXIST %PYTHONHOME%/Library/plugins/platforms/qwindows.dll ^
 cp %PYTHONHOME%/Library/plugins/platforms/qwindows.dll ./platforms/
 popd
-move ./%CMAKE_CONFIG% ../
+REM move ./%CMAKE_CONFIG% ../
 popd
 popd
 popd