1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0023769: Eliminate the dependence on X11 libs on Mac OS X

Removed ImageUtility package as it is no longer used.
Disabled Xw package building on Mac OS X when Cocoa used.
This commit is contained in:
dbv
2013-03-15 11:47:42 +04:00
parent 8c720dc1fe
commit 872f4e44da
29 changed files with 42 additions and 1660 deletions

View File

@@ -21,7 +21,12 @@
@uses "CSF.edl";
@if ( %Station == "wnt" ) then
-- Use GLX or Cocoa
@ifnotdefined ( %MACOSX_USE_GLX ) then
@set %MACOSX_USE_GLX = "${MACOSX_USE_GLX}";
@endif;
@if ( %Station == "wnt" || (%Station == "mac" && %MACOSX_USE_GLX != "true")) then
-- Pas de compile sur WNT
@set %WOKUMake_Steps = "src";
@endif;

View File

@@ -23,8 +23,13 @@
@ifnotdefined ( %Xw_WOKSteps_EDL ) then
---@set %Xw_WOKSteps_EDL = "";
-- Use GLX or Cocoa
@ifnotdefined ( %MACOSX_USE_GLX ) then
@set %MACOSX_USE_GLX = "${MACOSX_USE_GLX}";
@endif;
--- Insert your stuff Here
@if ( %Station == "wnt" ) then
@if ( %Station == "wnt" || (%Station == "mac" && %MACOSX_USE_GLX != "true")) then
-- Pas d'Xw sur Windows NT
@set %WOKSteps_ObjGroup = "";
@set %WOKSteps_DepGroup = "";

View File

@@ -22,9 +22,14 @@ sss
@ifnotdefined ( %Xw_WOKUMake_EDL ) then
@set %Xw_WOKUMake_EDL = "";
-- Use GLX or Cocoa
@ifnotdefined ( %MACOSX_USE_GLX ) then
@set %MACOSX_USE_GLX = "${MACOSX_USE_GLX}";
@endif;
--- Insert your stuff Here
@if ( %Station == "wnt" ) then
@if ( %Station == "wnt" || (%Station == "mac" && %MACOSX_USE_GLX != "true")) then
@set %WOKUMake_Steps = "*src xcpp.fill(src) xcpp.src(xcpp.fill) xcpp.header(xcpp.fill) .xcpp.template(xcpp.fill) obj.inc";
@endif;
@endif;