mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0032323: Configuration - drop unused dependency from Xmu
Removed unused header Aspect_XWD.hxx. Removed redundant includes of unused X11 extension headers. Added missing dependency on pthread to TKDraw. Added "-z defs" linker flag to qmake projects to detect missing library dependencies. Removed unused CSF_MotifLibs.
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
#if defined(HAVE_XLIB)
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#endif
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection,Standard_Transient)
|
||||
|
@@ -1,93 +0,0 @@
|
||||
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
||||
//
|
||||
// This file is part of Open CASCADE Technology software library.
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it under
|
||||
// the terms of the GNU Lesser General Public License version 2.1 as published
|
||||
// by the Free Software Foundation, with special exception defined in the file
|
||||
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef __Aspect_WNTXWD_HXX
|
||||
# define __Aspect_WNTXWD_HXX
|
||||
|
||||
#if !defined(_WIN32) && (!defined(__APPLE__) || defined(HAVE_XLIB)) && !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
|
||||
# include <X11/XWDFile.h>
|
||||
# else
|
||||
|
||||
# ifdef WORD64
|
||||
# define B32 :32
|
||||
# else
|
||||
# define B32
|
||||
# endif /* WORD64 */
|
||||
|
||||
# define XWD_FILE_VERSION 7
|
||||
|
||||
# define XYBitmap 0
|
||||
# define XYPixmap 1
|
||||
# define ZPixmap 2
|
||||
|
||||
# define LSBFirst 0
|
||||
# define MSBFirst 1
|
||||
|
||||
# define DoRed ( 1 << 0 )
|
||||
# define DoGreen ( 1 << 1 )
|
||||
# define DoBlue ( 1 << 2 )
|
||||
|
||||
# define StaticGray 0
|
||||
# define GrayScale 1
|
||||
# define StaticColor 2
|
||||
# define PseudoColor 3
|
||||
# define TrueColor 4
|
||||
# define DirectColor 5
|
||||
|
||||
typedef unsigned int CARD32;
|
||||
|
||||
typedef struct _xwd_file_header {
|
||||
|
||||
CARD32 header_size B32;
|
||||
CARD32 file_version B32;
|
||||
CARD32 pixmap_format B32;
|
||||
CARD32 pixmap_depth B32;
|
||||
CARD32 pixmap_width B32;
|
||||
CARD32 pixmap_height B32;
|
||||
CARD32 xoffset B32;
|
||||
CARD32 byte_order B32;
|
||||
CARD32 bitmap_unit B32;
|
||||
CARD32 bitmap_bit_order B32;
|
||||
CARD32 bitmap_pad B32;
|
||||
CARD32 bits_per_pixel B32;
|
||||
CARD32 bytes_per_line B32;
|
||||
CARD32 visual_class B32;
|
||||
CARD32 red_mask B32;
|
||||
CARD32 green_mask B32;
|
||||
CARD32 blue_mask B32;
|
||||
CARD32 bits_per_rgb B32;
|
||||
CARD32 colormap_entries B32;
|
||||
CARD32 ncolors B32;
|
||||
CARD32 window_width B32;
|
||||
CARD32 window_height B32;
|
||||
CARD32 window_x B32;
|
||||
CARD32 window_y B32;
|
||||
CARD32 window_bdrwidth B32;
|
||||
# ifdef WORD64
|
||||
CARD32 header_end B32;
|
||||
# endif /* WORD64 */
|
||||
} XWDFileHeader;
|
||||
|
||||
typedef struct _xcolor {
|
||||
|
||||
unsigned long pixel;
|
||||
unsigned short red;
|
||||
unsigned short green;
|
||||
unsigned short blue;
|
||||
char flags;
|
||||
char pad;
|
||||
|
||||
} XColor;
|
||||
|
||||
# endif /* _WIN32 */
|
||||
#endif /* __Aspect_WNTXWD_HXX */
|
@@ -80,4 +80,3 @@ Aspect_XRPoseActionData.hxx
|
||||
Aspect_XRSession.cxx
|
||||
Aspect_XRSession.hxx
|
||||
Aspect_XRTrackedDeviceRole.hxx
|
||||
Aspect_XWD.hxx
|
||||
|
Reference in New Issue
Block a user