Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Reorganize DLL Macros

Browse Source 
- Added DLL import definition to Apps



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@697 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-09-24 06:06:35 +00:00
parent 0a20e0e05c
commit 209965768c
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -9,6 +9,11 @@ if ( BUILD_APPS )
# Only build and fixbundle apps, when we are building OpenMesh standalone # Only build and fixbundle apps, when we are building OpenMesh standalone
if(${PROJECT_NAME} MATCHES "OpenMesh") if(${PROJECT_NAME} MATCHES "OpenMesh")
if ( WIN32 AND OPENMESH_BUILD_SHARED )
#!!!! Experimental Feature!!!
add_definitions(-DOPENMESHDLL ...)
endif()
add_subdirectory (Dualizer) add_subdirectory (Dualizer)
add_subdirectory (Decimating/commandlineDecimater) add_subdirectory (Decimating/commandlineDecimater)
add_subdirectory (Smoothing) add_subdirectory (Smoothing)

2
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!! # Experimental Feature!!!!
add_definitions( -DOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
else() else()
# OpenMesh has no dll exports so we have to build a static library on windows # OpenMesh has no dll exports so we have to build a static library on windows

10
src/OpenMesh/Core/System/OpenMeshDLLMacros.hh
View File

@@ -47,12 +47,12 @@
#ifndef OPENMESHDLLEXPORT #ifndef OPENMESHDLLEXPORT
#ifdef WIN32 #ifdef WIN32
#ifdef OPENMESHDLL #ifdef OPENMESHDLL
#ifdef USEOPENMESH #ifdef BUILDOPENMESHDLL
#define OPENMESHDLLEXPORT __declspec(dllimport) #define OPENMESHDLLEXPORT __declspec(dllexport)
#define OPENMESHDLLEXPORTONLY #define OPENMESHDLLEXPORTONLY __declspec(dllexport)
#else #else
#define OPENMESHDLLEXPORT __declspec(dllexport) #define OPENMESHDLLEXPORT __declspec(dllimport)
#define OPENMESHDLLEXPORTONLY __declspec(dllexport) #define OPENMESHDLLEXPORTONLY
#endif #endif
#else #else
#define OPENMESHDLLEXPORT #define OPENMESHDLLEXPORT

2
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!! # Experimental Feature!!!!
add_definitions( -DOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
else() else()
# OpenMesh has no dll exports so we have to build a static library on windows # OpenMesh has no dll exports so we have to build a static library on windows