Merge branch 'fixFreeglutPragmas' into 'master'

Fix freeglut pragmas

See merge request !102

CoreApp/CMakeLists.txt

@@ -144,6 +144,7 @@ if (WIN32)
                    -DUSEACG 
                    -DPLUGINLIBDLL
                    -DUSEPLUGINLIBDLL
+                   -DFREEGLUT_LIB_PRAGMAS=0
                    )
 endif ()
 

PluginLib/CMakeLists.txt

@@ -63,6 +63,7 @@ if (WIN32)
     -DPLUGINLIBDLL
     -DACGDLL
     -DUSEACG
+    -DFREEGLUT_LIB_PRAGMAS=0
   )
 endif ()
 

cmake/plugin.cmake

@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin)
       # Visual studio requires our plugins to link with GLUT
       find_package (GLUT)
       # generate dllinport defines
-      add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL)
+      add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL -DFREEGLUT_LIB_PRAGMAS=0)
       target_link_libraries (Plugin-${plugin}
     	${OPENMESH_LIBRARIES}
         ACG

cmake/type.cmake

@@ -29,6 +29,7 @@ if (WIN32)
     -DBUILDOBJECTTYPEDLL
     -DACGDLL
     -DUSEACG
+    -DFREEGLUT_LIB_PRAGMAS=0
   )
 endif ()
 

libs_required/ACG/CMakeLists.txt

@@ -73,7 +73,6 @@ include_directories (
 
 link_directories (
   ${GLEW_LIBRARY_DIR}
-  ${GLUT_LIBRARY_DIR}
 )
 
 #===================================================================
@@ -101,7 +100,7 @@ set (directories
 
 # generate dllexport macros on windows
 if (WIN32)
-  add_definitions(-DACGDLL)
+  add_definitions(-DACGDLL -DFREEGLUT_LIB_PRAGMAS=0)
   remove_definitions(-DUSEACG)
 endif ()