mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-29 14:00:49 +03:00
0023095: Porting demo and samples on OCCT 6.5.3
This commit is contained in:
dbv
@@ -1,4 +1,5 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
|
||||
EndProject
|
||||
Global
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
|
||||
EndProject
|
||||
Global
|
||||
|
||||
@@ -6,8 +6,9 @@ TARGET = IESample
|
||||
HEADERS = src/*.h
|
||||
SOURCES = src/*.cxx
|
||||
|
||||
INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(QTDIR)/include/QtCore \
|
||||
$(QTDIR)/include/QtGui $(QTDIR)/include
|
||||
INCLUDES = $$(CSF_OPT_INC)
|
||||
PATHS = $$split(INCLUDES,";")
|
||||
for(path, PATHS):INCLUDEPATH += $${path}
|
||||
|
||||
TS_FILES = ./src/Common-icon.ts \
|
||||
./src/Common-string.ts \
|
||||
@@ -42,110 +43,99 @@ win32 {
|
||||
CONFIG(debug, debug|release) {
|
||||
DEFINES += _DEBUG
|
||||
!contains(QMAKE_HOST.arch, x86_64) {
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
|
||||
LIBS = -L$(CSF_OPT_LIB32D)
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
|
||||
DESTDIR = ./win32/vc7/bind
|
||||
OBJECTS_DIR = ./win32/vc7/objd
|
||||
MOC_DIR = ./win32/vc7/srcd
|
||||
LIBS = -L$(CASROOT)/win32/vc7/libd
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
DESTDIR = ./win32/vc8/bind
|
||||
OBJECTS_DIR = ./win32/vc8/objd
|
||||
MOC_DIR = ./win32/vc8/srcd
|
||||
LIBS = -L$(CASROOT)/win32/vc8/libd
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
|
||||
DESTDIR = ./win32/vc9/bind
|
||||
OBJECTS_DIR = ./win32/vc9/objd
|
||||
MOC_DIR = ./win32/vc9/srcd
|
||||
LIBS = -L$(CASROOT)/win32/vc9/libd
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
|
||||
DESTDIR = ./win32/vc10/bind
|
||||
OBJECTS_DIR = ./win32/vc10/objd
|
||||
MOC_DIR = ./win32/vc10/srcd
|
||||
LIBS = -L$(CASROOT)/win32/vc10/libd
|
||||
}
|
||||
} else {
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
LIBS = -L$(CSF_OPT_LIB64D)
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
DESTDIR = ./win64/vc8/bind
|
||||
OBJECTS_DIR = ./win64/vc8/objd
|
||||
MOC_DIR = ./win64/vc8/srcd
|
||||
LIBS = -L$(CASROOT)/win64/vc8/libd
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
|
||||
DESTDIR = ./win64/vc9/bind
|
||||
OBJECTS_DIR = ./win64/vc9/objd
|
||||
MOC_DIR = ./win64/vc9/srcd
|
||||
LIBS = -L$(CASROOT)/win64/vc9/libd
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
|
||||
DESTDIR = ./win64/vc10/bind
|
||||
OBJECTS_DIR = ./win64/vc10/objd
|
||||
MOC_DIR = ./win64/vc10/srcd
|
||||
LIBS = -L$(CASROOT)/win64/vc10/libd
|
||||
}
|
||||
}
|
||||
} else {
|
||||
DEFINES += NDEBUG
|
||||
!contains(QMAKE_HOST.arch, x86_64) {
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
|
||||
LIBS = -L$(CSF_OPT_LIB32)
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
|
||||
DESTDIR = ./win32/vc7/bin
|
||||
OBJECTS_DIR = ./win32/vc7/obj
|
||||
MOC_DIR = ./win32/vc7/src
|
||||
LIBS = -L$(CASROOT)/win32/vc7/lib
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
DESTDIR = ./win32/vc8/bin
|
||||
OBJECTS_DIR = ./win32/vc8/obj
|
||||
MOC_DIR = ./win32/vc8/src
|
||||
LIBS = -L$(CASROOT)/win32/vc8/lib
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
|
||||
DESTDIR = ./win32/vc9/bin
|
||||
OBJECTS_DIR = ./win32/vc9/obj
|
||||
MOC_DIR = ./win32/vc9/src
|
||||
LIBS = -L$(CASROOT)/win32/vc9/lib
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
|
||||
DESTDIR = ./win32/vc10/bin
|
||||
OBJECTS_DIR = ./win32/vc10/obj
|
||||
MOC_DIR = ./win32/vc10/src
|
||||
LIBS = -L$(CASROOT)/win32/vc10/lib
|
||||
}
|
||||
} else {
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
LIBS = -L$(CSF_OPT_LIB64)
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
|
||||
DESTDIR = ./win64/vc8/bin
|
||||
OBJECTS_DIR = ./win64/vc8/obj
|
||||
MOC_DIR = ./win64/vc8/src
|
||||
LIBS = -L$(CASROOT)/win64/vc8/lib
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
|
||||
DESTDIR = ./win64/vc9/bin
|
||||
OBJECTS_DIR = ./win64/vc9/obj
|
||||
MOC_DIR = ./win64/vc9/src
|
||||
LIBS = -L$(CASROOT)/win64/vc9/lib
|
||||
}
|
||||
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
|
||||
DESTDIR = ./win64/vc10/bin
|
||||
OBJECTS_DIR = ./win64/vc10/obj
|
||||
MOC_DIR = ./win64/vc10/src
|
||||
LIBS = -L$(CASROOT)/win64/vc10/lib
|
||||
}
|
||||
}
|
||||
}
|
||||
DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
|
||||
}
|
||||
|
||||
LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
|
||||
-lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
|
||||
-lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
|
||||
-lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
|
||||
-lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
|
||||
-L$(QTDIR)/lib -lQtCore -lQtGui
|
||||
LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
|
||||
TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
|
||||
TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
|
||||
TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
|
||||
TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
|
||||
|
||||
lrelease.name = LRELASE ${QMAKE_FILE_IN}
|
||||
lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
|
||||
lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
|
||||
lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
|
||||
lrelease.input = TS_FILES
|
||||
lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
@echo off
|
||||
rem Launch MS VC with environment prepared for building OCCT qt tutorial
|
||||
|
||||
rem Set build environment
|
||||
|
||||
call %~dp0env.bat
|
||||
|
||||
call %~dp0..\..\..\ros\env_build.bat vc8 win32
|
||||
|
||||
rem Define path to project file
|
||||
set PRJFILE=%~dp0IESample-vc8.sln
|
||||
|
||||
rem Launch Visual Studio - either professional (devenv) or Express, as available
|
||||
if exist "%DevEnvDir%\devenv.exe" (
|
||||
start devenv.exe "%PRJFILE%" /useenv
|
||||
) else if exist "%DevEnvDir%\VCExpress.exe" (
|
||||
start VCExpress.exe "%PRJFILE%" /useenv
|
||||
) else (
|
||||
echo Error: Could not find MS Visual Studio ^(%VCVER%^)
|
||||
echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
|
||||
)
|
||||
|
||||
)
|
||||
|
||||
@@ -1,32 +1,3 @@
|
||||
@ECHO OFF
|
||||
|
||||
call "%~dp0..\..\..\ros\env.bat"
|
||||
|
||||
IF NOT DEFINED CASROOT GOTO ERR_CASROOT
|
||||
|
||||
IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
|
||||
|
||||
SET CASLIBS=%CASROOT%\win32\vc8\bin
|
||||
|
||||
SET ROOT=%CASROOT%\..
|
||||
|
||||
set RES_DIR=%~dp0res
|
||||
set BIN_DIR=%~dp0win32\vc8\bin
|
||||
SET RES_DIR=%~dp0res
|
||||
SET CSF_ResourcesDefaults=%RES_DIR%
|
||||
SET CSF_IEResourcesDefaults=%RES_DIR%
|
||||
|
||||
SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
|
||||
|
||||
GOTO END
|
||||
|
||||
:ERR_CASROOT
|
||||
ECHO Environment variable "CASROOT" has not been defined. Abort.
|
||||
pause
|
||||
exit /B
|
||||
|
||||
:ERR_CASCADE
|
||||
ECHO Environment variable "CASROOT" defined incorrectly. Abort.
|
||||
pause
|
||||
exit /B
|
||||
|
||||
:END
|
||||
|
||||
@@ -3,17 +3,8 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail
|
||||
|
||||
REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
|
||||
REM second argument specifies architecture) (win32 or win64)
|
||||
REM third argument specifies Debug or Release mode
|
||||
|
||||
call "%~dp0..\..\..\ros\env_build.bat" %1 %2
|
||||
call ..\..\..\env.bat %1 %2 %3
|
||||
|
||||
IF NOT DEFINED QTDIR GOTO ERR_QTDIR
|
||||
|
||||
SET PATH=%QTDIR%\bin;%PATH%
|
||||
|
||||
qmake -tp vc -r Tutorial.pro
|
||||
|
||||
GOTO END
|
||||
:ERR_QTDIR
|
||||
ECHO Environment variable "QTDIR" has not been defined. Abort.
|
||||
|
||||
:END
|
||||
qmake -tp vc -r IESample.pro
|
||||
|
||||
4
samples/qt/IESample/msvc.bat
Normal file
4
samples/qt/IESample/msvc.bat
Normal file
@@ -0,0 +1,4 @@
|
||||
call ../../../env.bat %1 %2 %3
|
||||
call %~dp0env.bat
|
||||
if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% IESample-%VCVER%.sln
|
||||
if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" IESample-%VCVER%.sln
|
||||
24
samples/qt/IESample/Run.bat → samples/qt/IESample/run.bat
Executable file → Normal file
24
samples/qt/IESample/Run.bat → samples/qt/IESample/run.bat
Executable file → Normal file
@@ -1,19 +1,11 @@
|
||||
@echo off
|
||||
call ../../../env.bat %1 %2 %3
|
||||
call %~dp0env.bat
|
||||
|
||||
call "%~dp0env.bat"
|
||||
|
||||
if not exist win32\vc8\obj goto QTSET
|
||||
|
||||
if not exist "%QTDIR%" goto QTSET
|
||||
|
||||
goto QT
|
||||
|
||||
:QTSET
|
||||
|
||||
set QTDIR=%ROOT%\3rdparty\win32\qt
|
||||
set PATH=%QTDIR%;%PATH%
|
||||
|
||||
:QT
|
||||
IF not "%CASDEB%" EQU "" (
|
||||
SET BIN_DIR=win%ARCH%\%VCVER%\bind
|
||||
) ELSE (
|
||||
SET BIN_DIR=win%ARCH%\%VCVER%\bin
|
||||
)
|
||||
|
||||
if not exist "%BIN_DIR%\IESample.exe" goto ERR_EXE
|
||||
|
||||
@@ -28,4 +20,4 @@ echo Probably you didn't compile the application.
|
||||
pause
|
||||
goto END
|
||||
|
||||
:END
|
||||
:END
|
||||
Reference in New Issue
Block a user