Commit 20996576 authored by Jan Möbius's avatar Jan Möbius

- Reorganize DLL Macros

- Added DLL import definition to Apps



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@697 fdac6126-5c0c-442c-9429-916003d36597
parent 0a20e0e0
......@@ -9,6 +9,11 @@ if ( BUILD_APPS )
# Only build and fixbundle apps, when we are building OpenMesh standalone
if(${PROJECT_NAME} MATCHES "OpenMesh")
if ( WIN32 AND OPENMESH_BUILD_SHARED )
#!!!! Experimental Feature!!!
add_definitions(-DOPENMESHDLL ...)
endif()
add_subdirectory (Dualizer)
add_subdirectory (Decimating/commandlineDecimater)
add_subdirectory (Smoothing)
......
......@@ -39,7 +39,7 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!!
add_definitions( -DOPENMESHDLL)
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
else()
# OpenMesh has no dll exports so we have to build a static library on windows
......
......@@ -47,12 +47,12 @@
#ifndef OPENMESHDLLEXPORT
#ifdef WIN32
#ifdef OPENMESHDLL
#ifdef USEOPENMESH
#define OPENMESHDLLEXPORT __declspec(dllimport)
#define OPENMESHDLLEXPORTONLY
#ifdef BUILDOPENMESHDLL
#define OPENMESHDLLEXPORT __declspec(dllexport)
#define OPENMESHDLLEXPORTONLY __declspec(dllexport)
#else
#define OPENMESHDLLEXPORT __declspec(dllexport)
#define OPENMESHDLLEXPORTONLY __declspec(dllexport)
#define OPENMESHDLLEXPORT __declspec(dllimport)
#define OPENMESHDLLEXPORTONLY
#endif
#else
#define OPENMESHDLLEXPORT
......
......@@ -39,7 +39,7 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!!
add_definitions( -DOPENMESHDLL)
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
else()
# OpenMesh has no dll exports so we have to build a static library on windows
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment