From 8e2c97ce788e55bd8161ef369b4bb4a281599741 Mon Sep 17 00:00:00 2001 From: bugmaster <> Date: Fri, 20 May 2011 08:26:54 +0000 Subject: [PATCH] Update for work with qmake pro file --- samples/qt/IESample/IESample-vc10.sln | 18 + .../{IESample.sln => IESample-vc8.sln} | 2 - samples/qt/IESample/IESample-vc9.sln | 18 + samples/qt/IESample/IESample.pro | 105 +++- samples/qt/IESample/IESample.vcproj | 518 ------------------ samples/qt/IESample/Run_MSVC.bat | 2 +- 6 files changed, 132 insertions(+), 531 deletions(-) create mode 100644 samples/qt/IESample/IESample-vc10.sln rename samples/qt/IESample/{IESample.sln => IESample-vc8.sln} (97%) mode change 100755 => 100644 create mode 100644 samples/qt/IESample/IESample-vc9.sln delete mode 100755 samples/qt/IESample/IESample.vcproj diff --git a/samples/qt/IESample/IESample-vc10.sln b/samples/qt/IESample/IESample-vc10.sln new file mode 100644 index 0000000000..435a46503a --- /dev/null +++ b/samples/qt/IESample/IESample-vc10.sln @@ -0,0 +1,18 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.Build.0 = Debug|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.ActiveCfg = Release|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/qt/IESample/IESample.sln b/samples/qt/IESample/IESample-vc8.sln old mode 100755 new mode 100644 similarity index 97% rename from samples/qt/IESample/IESample.sln rename to samples/qt/IESample/IESample-vc8.sln index 5bcf6cf18a..16c5b7517f --- a/samples/qt/IESample/IESample.sln +++ b/samples/qt/IESample/IESample-vc8.sln @@ -1,6 +1,4 @@ - 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 diff --git a/samples/qt/IESample/IESample-vc9.sln b/samples/qt/IESample/IESample-vc9.sln new file mode 100644 index 0000000000..02baed55cc --- /dev/null +++ b/samples/qt/IESample/IESample-vc9.sln @@ -0,0 +1,18 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Debug|Win32.Build.0 = Debug|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.ActiveCfg = Release|Win32 + {7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro index 6519892ef0..fe644d9b80 100644 --- a/samples/qt/IESample/IESample.pro +++ b/samples/qt/IESample/IESample.pro @@ -6,14 +6,13 @@ TARGET = IESample HEADERS = src/*.h SOURCES = src/*.cxx -INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(CASROOT)/src/WOKTclLib $(QTDIR)/include/QtCore \ +INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(QTDIR)/include/QtCore \ $(QTDIR)/include/QtGui $(QTDIR)/include TRANSLATIONS += ./src/Common-icon.ts \ ./src/Common-string.ts \ ./src/Interface-string.ts - DEFINES = CSFDB unix { @@ -29,21 +28,107 @@ unix { INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD + TBB_LIB = $$(TBBLIB) + exists($$TBB_LIB) { + LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc + } } win32 { CONFIG(debug, debug|release) { DEFINES += _DEBUG - DESTDIR = ./win32/bind - OBJECTS_DIR = ./win32/objd - MOC_DIR = ./win32/srcd - LIBS = -L$(CASROOT)/win32/libd + !contains(QMAKE_HOST.arch, x86_64) { + 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) { + 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 - DESTDIR = ./win32/bin - OBJECTS_DIR = ./win32/obj - MOC_DIR = ./win32/src - LIBS = -L$(CASROOT)/win32/lib + !contains(QMAKE_HOST.arch, x86_64) { + 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) { + 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 } diff --git a/samples/qt/IESample/IESample.vcproj b/samples/qt/IESample/IESample.vcproj deleted file mode 100755 index f32e068e66..0000000000 --- a/samples/qt/IESample/IESample.vcproj +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/qt/IESample/Run_MSVC.bat b/samples/qt/IESample/Run_MSVC.bat index 3f712ae038..4daacb50ef 100755 --- a/samples/qt/IESample/Run_MSVC.bat +++ b/samples/qt/IESample/Run_MSVC.bat @@ -8,7 +8,7 @@ call %~dp0env.bat call %~dp0..\..\..\ros\env_build.bat vc8 win32 rem Define path to project file -set PRJFILE=%~dp0IESample.sln +set PRJFILE=%~dp0IESample-vc8.sln rem Launch Visual Studio - either professional (devenv) or Express, as available if exist "%DevEnvDir%\devenv.exe" (