[SCM] OCE packaging branch, debian, updated. debian/0.11-1
QbProg
tholag at gmail.com
Thu Dec 13 19:16:52 UTC 2012
The following commit has been merged in the debian branch:
commit 07107808fdc9af5d99fa6e7069bf1b023fb5425d
Author: Massimo Del Fedele <max at veneto.com>
Date: Tue Nov 20 17:26:05 2012 +0100
Fixed linker errors in static build
diff --git a/inc/InterfaceGraphic_WNT.hxx b/inc/InterfaceGraphic_WNT.hxx
index 3b6f03e..8bf2cc6 100644
--- a/inc/InterfaceGraphic_WNT.hxx
+++ b/inc/InterfaceGraphic_WNT.hxx
@@ -43,6 +43,8 @@
#define WDF_NOERASEBKGRND 0x00000001
#define WDF_FOREIGN 0x00000002
+# include <Standard_Macro.hxx>
+
typedef struct window_data {
void* WNT_Window_Ptr; // pointer to WNT_Window
@@ -76,15 +78,8 @@ typedef struct font_data {
} FONT_DATA;
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
- __declspec( dllimport ) long InterfaceGraphic_RealizePalette ( HDC, HPALETTE, BOOL, BOOL );
+Standard_IMPORTC long InterfaceGraphic_RealizePalette ( HDC, HPALETTE, BOOL, BOOL );
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
#endif //WNT
#endif /* __INTERFACE_GRAPHIC_WNT_HXX */
diff --git a/src/Graphic3d/Graphic3d_WNTGraphicDevice.cxx b/src/Graphic3d/Graphic3d_WNTGraphicDevice.cxx
index 2ee9998..71edcfa 100644
--- a/src/Graphic3d/Graphic3d_WNTGraphicDevice.cxx
+++ b/src/Graphic3d/Graphic3d_WNTGraphicDevice.cxx
@@ -135,6 +135,12 @@ void Graphic3d_WNTGraphicDevice::SetGraphicDriver ()
{
MyGraphicDriver = MetaGraphicDriverFactory("");
}
+
+void Graphic3d_WNTGraphicDevice::SetGraphicDriver (const Standard_CString theGraphicLib)
+{
+ MyGraphicDriver = MetaGraphicDriverFactory("");
+}
+
#endif
#endif // WNT
diff --git a/src/InterfaceGraphic/InterfaceGraphic_Palette.c b/src/InterfaceGraphic/InterfaceGraphic_Palette.c
index e3612b6..2c2f594 100644
--- a/src/InterfaceGraphic/InterfaceGraphic_Palette.c
+++ b/src/InterfaceGraphic/InterfaceGraphic_Palette.c
@@ -40,6 +40,8 @@ int _a_horreur_du_vide_a_la_compilation;
#define BLACK RGB( 0, 0, 0 )
#define WHITE RGB( 255, 255, 255 )
+#include <Standard_Macro.hxx>
+
static int s_sysPalIdx[ NB_STATIC_COLORS ] = {
COLOR_SCROLLBAR,
@@ -105,7 +107,7 @@ static COLORREF s_sysPalBW[ NB_STATIC_COLORS ] = {
static BOOL s_sysUse;
static COLORREF s_sysPal[ NB_STATIC_COLORS ];
-__declspec( dllexport ) long InterfaceGraphic_RealizePalette ( HDC hdc, HPALETTE hPal, BOOL fBkg, BOOL fUseStatic ) {
+Standard_EXPORTEXTERN long InterfaceGraphic_RealizePalette ( HDC hdc, HPALETTE hPal, BOOL fBkg, BOOL fUseStatic ) {
int i;
long retVal = 0;
--
OCE packaging
More information about the debian-science-commits
mailing list