Show
Ignore:
Timestamp:
06/07/07 13:33:22 (1 year ago)
Author:
aronb
Message:

Merge revisions 746 and 747 to fix windows build.

01:30 Changeset [747] by vossg

fixed : win compile problems

01:27 Changeset [746] by vossg

fixed : windows compile problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/fcptr_stable_jun07/Source/Contrib/Manipulators/OSGManipulatorFields.h

    r711 r752  
    5656 
    5757#include "OSGConfig.h" 
    58 #include "OSGSystemDef.h" 
     58#include "OSGContribGUIDef.h" 
    5959 
    6060#include "OSGTransformFields.h" 
    …… 
    113113    enum                        { Convertible = NotConvertible }; 
    114114 
    115     static OSG_SYSTEM_DLLMAPPING DataType &getType(void); 
     115    static OSG_CONTRIBGUI_DLLMAPPING DataType &getType(void); 
    116116 
    117117    static const char *getSName(void) { return "SFManipulatorPtr"; } 
    …… 
    135135 
    136136#ifndef OSG_COMPILEMANIPULATORINST 
    137 OSG_FIELD_DLLEXPORT_DECL1(SField, ManipulatorPtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     137OSG_FIELD_DLLEXPORT_DECL1(SField, ManipulatorPtr, OSG_CONTRIBGUI_DLLTMPLMAPPING) 
    138138#endif 
    139139 
    …… 
    145145 
    146146#ifndef OSG_COMPILEMANIPULATORINST 
    147 OSG_FIELD_DLLEXPORT_DECL1(MField, ManipulatorPtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     147OSG_FIELD_DLLEXPORT_DECL1(MField, ManipulatorPtr, OSG_CONTRIBGUI_DLLTMPLMAPPING) 
    148148#endif 
    149149