Issue 33459 - avmedia module includes files which do not exist
Summary: avmedia module includes files which do not exist
Status: CLOSED FIXED
Alias: None
Product: General
Classification: Code
Component: code (show other issues)
Version: 680m51
Hardware: PC Windows 2000
: P1 (highest) Trivial (vote)
Target Milestone: OOo 2.0
Assignee: foskey
QA Contact: issues@framework
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-08-26 21:26 UTC by pavel
Modified: 2004-09-08 16:53 UTC (History)
4 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2004-08-26 21:26:55 UTC
Hi,

is there any new build requirement? Is it documented? Why configure doesn't
check for it?

While building SRC680_m51 on Windows with .NET2002:

pavel@drogo:~/BuildDir/ooo_SRC680_m51_src/avmedia> build
build -- version: 1.114

/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/avmedia/source/framework
-------------
/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/avmedia/source/win
--- EXCEPTIONSFILES ---
`../../wntmsci8.pro/slo/winuno.obj' is up to date
--- EXCEPTIONSFILES OVER ---
------------------------------
Making: ../../wntmsci8.pro/slo/player.obj
guw.pl /cygdrive/e/MICROS~1.NET/VC7/BIN/cl.exe -Zm500 -wd4290 -wd4786 -wd4800
-Zc:forScope -GR -c -nologo -Gs -Gy  -I.  -I. -I../inc -I../../inc
-I../../WIN/inc -I../../wntmsci8.pro/inc -I.
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solver/680/wntmsci8.pro/inc/stl
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solver/680/wntmsci8.pro/inc/external
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solver/680/wntmsci8.pro/inc
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solenv/wntmsci8/inc
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solenv/inc
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/res
-I/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/solver/680/wntmsci8.pro/inc/stl
-I/cygdrive/c/j2sdk1.4.2_04/include/win32 -I/cygdrive/c/j2sdk1.4.2_04/include
-I/cygdrive/c/PROGRA~1/MICROS~2/include -I/cygdrive/e/MICROS~1.NET/VC7/include 
   -I. -I../../res -I. -Ob1 -Ox -Oy- -Gd     -DWNT -DWNT -DNT351 -DMSC -DM1300
-DINTEL -D_USE_NAMESPACE -D_X86_=1  -DFULL_DESK -DSTLPORT_VERSION=400
-DWINVER=0x400 -D_WIN32_IE=0x400 -D_MT -DCPPU_ENV=msci -DSUPD=680 -DPRODUCT
-DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DEXCEPTIONS_OFF -DCUI
-DSOLAR_JAVA -DSRC680   -DSHAREDLIB -D_DLL_ -DWIN32 -D_MT -D_DLL -DWIN32 -D_MT
-D_DLL -DMULTITHREAD -W3 -Fo../../wntmsci8.pro/slo/player.obj
/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/avmedia/source/win/player.cxx 

guw.pl /cygdrive/e/MICROS~1.NET/VC7/BIN/cl.exe @/tmp/mkb02388
player.cxx
e:\home\pavel\BuildDir\ooo_SRC680_m51_src\avmedia\source\win\player.cxx(65) :
fatal error C1083: Cannot open include file: 'strmif.h': No such file or directory
dmake:  Error code 2, while making '../../wntmsci8.pro/slo/player.obj'
echo: No match.

ERROR: Error 65280 occurred while making
/cygdrive/e/home/pavel/BuildDir/ooo_SRC680_m51_src/avmedia/source/win
pavel@drogo:~/BuildDir/ooo_SRC680_m51_src/avmedia> 

pavel@linux:~/.ooo/ooo_SRC680_m51_src/avmedia> grep -r strmif.h *
source/win/player.cxx:#include <strmif.h>
source/win/window.cxx:#include <strmif.h>

The same applies for control.h:

pavel@drogo:~/BuildDir/ooo_SRC680_m51_src/avmedia/source/win> grep control.h *
player.cxx:#include <control.h>
window.cxx:#include <control.h>

and uuids.h.
Comment 1 pavel 2004-08-26 23:14:28 UTC
vq told me that these files are in DirectX SDK.

But this module is not conditionalized on --disable-directx configure option.
See e.g. canvas project.
Comment 2 ooo 2004-08-27 09:56:29 UTC
have to clarify this
Comment 3 ooo 2004-08-27 14:40:32 UTC
--disable-directx switch is taken into account now when building avmedia project
and scp2 project; you need to update the following files to get this bugfix
immediately:

avmedia/source/win/makefile.mk
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk

Media support is disabled on Windows in this case, of course.
Comment 4 pavel 2004-08-27 16:12:36 UTC
The environment variable to check is DIRECTX_SUPPORT and not ENABLE_DIRECTX.

Yes, the same problem is in canvas/.

waratah: who invented this mess of ENABLE_DIRECTX vs. DIRECTX_SUPPORT?
This is connected with issue #i26548#.
Comment 5 ooo 2004-08-27 16:27:27 UTC
according to #i26548#, the correct varname to use now is ENABLE_DIRECTX; just
talked with Thorsten, who changed this according to a suggestion by waratah;
please clarify this before we make any changes in several projects again
Comment 6 foskey 2004-08-27 16:43:47 UTC
This should definitely be ENABLE to be consistent with other variables in use.

Not sure what happened but this was an oversite in configure updates or it got
lost somewhere in the various unmerged branches.  Will correct on next cws.

Patches accepted :-)
Comment 7 pavel 2004-08-27 19:56:02 UTC
waratah: should be as simple as:

--- set_soenv.in.~1.19.~	2004-07-13 17:43:01.000000000 +0200
+++ set_soenv.in	2004-08-27 20:55:22.996900168 +0200
@@ -1732,7 +1732,7 @@
 ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
 ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
 ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
-ToFile( "DIRECTX_SUPPORT",   "@ENABLE_DIRECTX@",    "e" );
+ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
 ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
 ToFile( "WITH_LIBART",       "@WITH_LIBART@",      "e" );

Right?
Comment 8 pavel 2004-08-30 20:29:38 UTC
Patch commited to pj01 cws.
Comment 9 jens-heiner.rechtien 2004-08-31 14:15:14 UTC
Verified.
Comment 10 pavel 2004-09-08 16:53:25 UTC
Closing.