Tag: cws_src680_oj14 User: fs Date: 2007-06-23 21:22:47+0000 Modified: dba/dbaccess/source/ui/dlg/makefile.mk
Log: RESYNC: (1.35-1.36); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/makefile.mk?r1=1.30.8.5&r2=1.30.8.6 Delta lines: +12 -4 -------------------- --- makefile.mk 2007-06-05 10:16:31+0000 1.30.8.5 +++ makefile.mk 2007-06-23 21:22:45+0000 1.30.8.6 @@ -47,6 +47,10 @@ CFLAGS+=-DSYSTEM_ODBC_HEADERS .ENDIF +.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" +CDEFS+=-DWINDOWS_VISTA_PSDK +.ENDIF + .IF "$(GUI)$(COM)"=="WNTGCC" # for adoint.h CFLAGS+=-fpermissive .ENDIF @@ -128,7 +132,11 @@ $(SLO)$/dlgsize.obj \ $(SLO)$/dlgattr.obj -.IF "$(GUI)"=="WNT" +.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" +DISABLE_ADO=TRUE +.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" + +.IF "$(GUI)"=="WNT" && "$(DISABLE_ADO)"=="" SLOFILES+= $(SLO)$/adodatalinks.obj .ENDIF --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
