[Shallows-commits] shallows CMakeLists.txt, 1.4, 1.5 config.h.cmake, 1.2, 1.3

[Johan S. <jo...@us...>]

Update of /cvsroot/shallows/shallows
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24872

Modified Files:
	CMakeLists.txt config.h.cmake 
Log Message:
More COMPILING_SHALLOWS fixes for Win32

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/shallows/shallows/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CMakeLists.txt	19 Jan 2007 13:18:46 -0000	1.4
--- CMakeLists.txt	19 Jan 2007 13:25:49 -0000	1.5
***************
*** 31,36 ****
  
  if(WIN32)
! 	set(DllExport "__declspec( dllexport )" )
! 	add_definitions(-DNOMINMAX)
  endif(WIN32)
   
--- 31,36 ----
  
  if(WIN32)
! 	#set(DllExport "__declspec( dllexport )" )
! 	add_definitions(-DNOMINMAX -DCOMPILING_SHALLOWS)
  endif(WIN32)
   

Index: config.h.cmake
===================================================================
RCS file: /cvsroot/shallows/shallows/config.h.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h.cmake	15 Sep 2006 09:04:08 -0000	1.2
--- config.h.cmake	19 Jan 2007 13:25:49 -0000	1.3
***************
*** 4,7 ****
  #cmakedefine HAVE_CGGL 1
  
! #cmakedefine DllExport
  
--- 4,15 ----
  #cmakedefine HAVE_CGGL 1
  
! #ifdef _WIN32
! #ifdef COMPILING_SHALLOWS
! #define DllExport __declspec( dllexport )
! #else
! #define DllExport __declspec( dllimport )
! #endif
! #else
! #define DllExport
! #endif