--- a/holdingarea/CMakeLists.txt Fri Sep 24 13:15:40 2010 +0100
+++ b/holdingarea/CMakeLists.txt Fri Sep 24 13:29:27 2010 +0100
@@ -98,9 +98,11 @@
if(WIN32)
if (PLATSIM_EXTENSIONS)
- add_subdirectory(serialization/Graphics/KhronosAPIWrapper) # Platsim serialization
+ add_subdirectory(serialization/Graphics/KhronosAPIWrapper) # Simulator serialization (host)
add_dependencies(KhronosAPIWrapper libEGL libGLESv1 libGLESv2 hostthreadadapter)
- set(ALL_TARGETS libEGL libOpenVG libGLESv1 libGLESv2 hostthreadadapter KhronosAPIWrapper ${DEV_EXTRA_TARGETS})
+ add_subdirectory(syborggraphicswrapper) # Simulator serialization (guest)
+ add_dependencies(syborg-graphicswrapper KhronosAPIWrapper hostthreadadapter)
+ set(ALL_TARGETS libEGL libOpenVG libGLESv1 libGLESv2 hostthreadadapter KhronosAPIWrapper syborg-graphicswrapper ${DEV_EXTRA_TARGETS})
else(PLATSIM_EXTENSIONS)
set(ALL_TARGETS libEGL libOpenVG libGLESv1 libGLESv2 ${DEV_EXTRA_TARGETS})
endif(PLATSIM_EXTENSIONS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/holdingarea/build.bat Fri Sep 24 13:29:27 2010 +0100
@@ -0,0 +1,113 @@
+@echo off
+
+rem DOS batch file for building host-side libraries
+
+rem Set default values
+set USE_MINI_EGL=OFF
+set PLATSIM_EXTENSIONS=ON
+set VISUAL_STUDIO_VERSION=2005
+set CMAKE_BUILD_TARGET=Release
+set VISUAL_STUDIO_SOLUTION=OFF
+set BUILD=ON
+
+:PARSECOMMANDLINE
+IF '%1'=='/h' goto PRINTUSAGE
+IF '%1'=='/H' goto PRINTUSAGE
+IF '%1'=='/?' goto PRINTUSAGE
+IF '%1'=='/miniegl' goto ENABLEMINIEGL
+IF '%1'=='/MINIEGL' goto ENABLEMINIEGL
+IF '%1'=='/noplatsim' goto DISABLEPLATSIM
+IF '%1'=='/NOPLATSIM' goto DISABLEPLATSIM
+IF '%1'=='/vs' goto SETVISUALSTUDIOVERSION
+IF '%1'=='/VS' goto SETVISUALSTUDIOVERSION
+IF '%1'=='/solution' goto ENABLESOLUTION
+IF '%1'=='/SOLUTION' goto ENABLESOLUTION
+IF '%1'=='/debug' goto ENABLEDEBUG
+IF '%1'=='/DEBUG' goto ENABLEDEBUG
+IF '%1'=='/nobuild' goto DISABLEBUILD
+IF '%1'=='/NOBUILD' goto DISABLEBUILD
+
+if "%VISUAL_STUDIO_SOLUTION%"=="ON" (
+ set GENERATOR=Visual Studio 8 2005
+ if '%VISUAL_STUDIO_VERSION%'=='2008' set GENERATOR=Visual Studio 9 2008
+) else (
+ set GENERATOR=NMake Makefiles
+)
+
+rem Print out options
+echo.
+echo USE_MINI_EGL = %USE_MINI_EGL%
+echo PLATSIM_EXTENSIONS = %PLATSIM_EXTENSIONS%
+echo VISUAL_STUDIO_VERSION = %VISUAL_STUDIO_VERSION%
+echo GENERATOR = %GENERATOR%
+echo CMAKE_BUILD_TARGET = %CMAKE_BUILD_TARGET%
+echo BUILD = %BUILD%
+echo.
+
+rem Execute
+echo on
+rmdir /s /q build
+mkdir build
+cd build
+cmake -DUSE_MINI_EGL:Bool=%USE_MINI_EGL% -DPLATSIM_EXTENSIONS:Bool=%PLATSIM_EXTENSIONS% -DVISUAL_STUDIO_VERSION:String=%VISUAL_STUDIO_VERSION% -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TARGET% -G "%GENERATOR%" ../..
+@echo off
+if "%BUILD%"=="ON" (
+if "%GENERATOR%"=="NMake Makefiles" (
+ echo on
+ nmake
+ @echo off
+)
+)
+@echo off
+cd ..
+
+goto END
+
+:PRINTUSAGE
+echo Usage: build.bat [options]
+echo Options:"
+echo [/H,/?] print this message and exit
+echo [/MINIEGL] build with miniEGL (default: disabled)
+echo [/VS VERSION] set Visual Studio version
+echo supported versions = 2005, 2008 (default: 2005)
+echo [/SOLUTION] just generate VIsual Studio solution files
+echo (default: generate NMake makefiles and build)
+echo [/DEBUG] configure for debug build (default: release)
+echo [/NOBUILD] call cmake but do not call nmake
+echo note: has no effect if /SOLUTION is specified
+goto END
+
+:ENABLEMINIEGL
+set USE_MINI_EGL=ON
+shift
+goto PARSECOMMANDLINE
+
+:DISABLEPLATSIM
+set PLATSIM_EXTENSIONS=OFF
+shift
+goto PARSECOMMANDLINE
+
+:SETVISUALSTUDIOVERSION
+set VISUAL_STUDIO_VERSION=%2
+shift
+shift
+goto PARSECOMMANDLINE
+
+:ENABLESOLUTION
+set VISUAL_STUDIO_SOLUTION=ON
+shift
+goto PARSECOMMANDLINE
+
+:ENABLEDEBUG
+set CMAKE_BUILD_TARGET=Debug
+shift
+goto PARSECOMMANDLINE
+
+:DISABLEBUILD
+set BUILD=OFF
+shift
+goto PARSECOMMANDLINE
+
+:END
+
+
--- a/holdingarea/cmake/FindLLVM.cmake Fri Sep 24 13:15:40 2010 +0100
+++ b/holdingarea/cmake/FindLLVM.cmake Fri Sep 24 13:29:27 2010 +0100
@@ -44,7 +44,9 @@
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else(NOT WIN32)
- # set(LLVM_LFLAGS "-L${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib")
+ set(LLVM_LIB_PATH "${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/x86-win32-vs${VISUAL_STUDIO_VERSION}/${CMAKE_BUILD_TYPE}/lib")
+ message("LLVM_LIB_PATH ${LLVM_LIB_PATH}")
+ link_directories(${LLVM_LIB_PATH})
endif(NOT WIN32)
if(NOT WIN32)
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMAnalysis.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMArchive.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMAsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMAsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMBitReader.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMBitWriter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMCodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMCore.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMExecutionEngine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMInstCombine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMInstrumentation.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMInterpreter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMJIT.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMLinker.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMMC.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMMCParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMScalarOpts.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMSelectionDAG.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMSupport.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMSystem.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMTarget.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMTransformUtils.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMX86AsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMX86AsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMX86CodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMX86Disassembler.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMX86Info.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMipa.lib has changed
Binary file holdingarea/llvm/llvm-2.7/lib/LLVMipo.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMAnalysis.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMArchive.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMAsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMAsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMBitReader.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMBitWriter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMCodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMCore.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMExecutionEngine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMInstCombine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMInstrumentation.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMInterpreter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMJIT.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMLinker.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMMC.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMMCParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMScalarOpts.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMSelectionDAG.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMSupport.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMSystem.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMTarget.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMTransformUtils.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMX86AsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMX86AsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMX86CodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMX86Disassembler.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMX86Info.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMipa.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/debug/lib/LLVMipo.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMAnalysis.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMArchive.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMAsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMAsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMBitReader.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMBitWriter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMCodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMCore.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMExecutionEngine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMInstCombine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMInstrumentation.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMInterpreter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMJIT.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMLinker.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMMC.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMMCParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMScalarOpts.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMSelectionDAG.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMSupport.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMSystem.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMTarget.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMTransformUtils.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMX86AsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMX86AsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMX86CodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMX86Disassembler.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMX86Info.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMipa.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2005/release/lib/LLVMipo.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMAnalysis.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMArchive.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMAsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMAsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMBitReader.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMBitWriter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMCodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMCore.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMExecutionEngine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMInstCombine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMInstrumentation.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMInterpreter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMJIT.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMLinker.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMMC.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMMCParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMScalarOpts.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMSelectionDAG.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMSupport.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMSystem.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMTarget.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMTransformUtils.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMX86AsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMX86AsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMX86CodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMX86Disassembler.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMX86Info.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMipa.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/debug/lib/LLVMipo.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMAnalysis.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMArchive.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMAsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMAsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMBitReader.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMBitWriter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMCodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMCore.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMExecutionEngine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMInstCombine.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMInstrumentation.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMInterpreter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMJIT.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMLinker.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMMC.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMMCParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMScalarOpts.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMSelectionDAG.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMSupport.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMSystem.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMTarget.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMTransformUtils.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMX86AsmParser.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMX86AsmPrinter.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMX86CodeGen.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMX86Disassembler.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMX86Info.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMipa.lib has changed
Binary file holdingarea/llvm/llvm-2.7/x86-win32-vs2008/release/lib/LLVMipo.lib has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/holdingarea/syborggraphicswrapper/CMakeLists.txt Fri Sep 24 13:29:27 2010 +0100
@@ -0,0 +1,47 @@
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http:#www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# CMake meta build file for the simulator guest-side API wrapper
+
+set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set(INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+set(LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+
+set(HOSTTHREADADAPTER_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../hostsupport/hostthreadadapter/inc)
+set(KHRONOSAPIWRAPPER_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../serialization/Graphics/KhronosAPIWrapper/inc)
+set(GUESTVIDEODRIVERINTERFACECONSTANTS_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../serialization/Graphics)
+set(SERIALIZER_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../guestrendering/vghwserialiser/inc)
+
+set(SRC_FILES
+ ${INC_DIR}/syborg-graphicswrapper.h
+ ${SRC_DIR}/syborg-graphicswrapper.cpp
+)
+
+include_directories(
+ ${INC_DIR}
+ ${COMMON_INC_DIR}
+ ${HOSTTHREADADAPTER_INC_DIR}
+ ${KHRONOSAPIWRAPPER_INC_DIR}
+ ${SERIALIZER_INC_DIR}
+ ${GUESTVIDEODRIVERINTERFACECONSTANTS_INC_DIR}
+ )
+
+link_directories(${LIBS_DIR} ${GLOBAL_LIB_DIR})
+
+add_definitions(-DSYBORG_GRAPHICSWRAPPER_EXPORTS)
+
+add_library(syborg-graphicswrapper SHARED ${SRC_FILES})
+
+target_link_libraries(syborg-graphicswrapper KhronosAPIWrapper hostthreadadapter)
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/holdingarea/syborggraphicswrapper/inc/syborg-graphicswrapper.h Fri Sep 24 13:29:27 2010 +0100
@@ -0,0 +1,47 @@
+#ifndef _SYBORG_GRAPHICSWRAPPER_H
+#define _SYBORG_GRAPHICSWRAPPER_H
+
+#pragma once
+
+#ifdef WIN32
+#ifdef SYBORG_GRAPHICSWRAPPER_EXPORTS
+#define SYBORG_GRAPHICSWRAPPER_API __declspec(dllexport)
+#else
+#define SYBORG_GRAPHICSWRAPPER_API __declspec(dllimport)
+#endif
+#else
+#define SYBORG_GRAPHICSWRAPPER_API
+#endif
+
+Psu::PLATFORM_SEMAPHORE_T m_outputBufferSemaphore;
+int (*m_pythonCallBack)(int);
+KhronosAPIWrapper* m_wrapper;
+
+
+// Derived from GraphicsVirtualHW.lisa
+static const int VVHW_BUFFER (0x3000000);
+static const int VVHW_INPUT_BUFFER (0x1000000);
+static const int VVHW_INPUT_BASE(0x0);
+static const int VVHW_OUTPUT_BUFFER (0x1000000);
+static const int VVHW_OUTPUT_BASE(0x1000000);
+static const int VVHW_FRAME_BUFFER (0x1000000);
+static const int VVHW_FRAME_BASE(0x2000000);
+
+class SyborgGraphicsWrapper : public MGraphicsVHWCallback
+ {
+ public:
+
+ SyborgGraphicsWrapper();
+ ~SyborgGraphicsWrapper();
+
+ int Reset( uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase );
+
+ virtual void LockOutputBuffer();
+ virtual void ReleaseOutputBuffer();
+ virtual void ProcessingDone(int i);
+
+ private:
+ };
+
+
+#endif // _SYBORG_GRAPHICSWRAPPER_H
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/holdingarea/syborggraphicswrapper/src/syborg-graphicswrapper.cpp Fri Sep 24 13:29:27 2010 +0100
@@ -0,0 +1,150 @@
+// This is the main DLL file.
+
+#include "platformtypes.h"
+#include <KhronosAPIWrapper.h>
+#include <guestvideodriverinterfaceconstants.h> //Registers and enums
+#include <platformthreading.h> //mutex
+#include <graphicsvhwcallback.h>
+#include "syborg-graphicswrapper.h"
+
+SyborgGraphicsWrapper::SyborgGraphicsWrapper()
+ {
+ }
+
+SyborgGraphicsWrapper::~SyborgGraphicsWrapper()
+ {
+ delete m_wrapper;
+ m_wrapper = 0;
+
+ Psu::platform_release_semaphore(m_outputBufferSemaphore);
+ }
+
+int SyborgGraphicsWrapper::Reset( uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase )
+ {
+ int ret = -1;
+ if ( m_wrapper )
+ {
+ delete m_wrapper;
+ }
+ m_wrapper = NULL;
+
+ uint8_t *cmd_buffer = (uint8_t *)aCommandMemBase;
+ uint8_t *frame_buffer = (uint8_t *)aGraphicsMemBase;
+ if( (cmd_buffer != NULL) && (frame_buffer != NULL) )
+ {
+ m_wrapper = new KhronosAPIWrapper( (MGraphicsVHWCallback*)this,
+ frame_buffer, &cmd_buffer[VVHW_INPUT_BASE], &cmd_buffer[VVHW_OUTPUT_BASE] );
+ //Reset synchronisation mechanisms
+ Psu::platform_release_semaphore(m_outputBufferSemaphore);
+ Psu::platform_create_semaphore(m_outputBufferSemaphore, 1, 1);
+ ret = 0;
+ }
+ else
+ {
+ ret = -1;
+ }
+ return ret;
+ }
+
+void SyborgGraphicsWrapper::LockOutputBuffer()
+ {
+ #ifdef KHRONOS_API_W_MULTITHREAD
+ Psu::platform_wait_for_signal(m_outputBufferSemaphore);
+ #endif
+ }
+
+void SyborgGraphicsWrapper::ReleaseOutputBuffer(){}
+
+void SyborgGraphicsWrapper::ProcessingDone(int i)
+ {
+ m_pythonCallBack( i );
+ }
+
+extern "C"
+ {
+ SYBORG_GRAPHICSWRAPPER_API SyborgGraphicsWrapper* create_SyborgGraphicsWrapper()
+ {
+ return new SyborgGraphicsWrapper();
+ }
+ SYBORG_GRAPHICSWRAPPER_API int initialize_SyborgGraphicsWrapper( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ Psu::platform_create_semaphore(m_outputBufferSemaphore, 1, 1);
+ // Change to proper error handling
+ return 0;
+ }
+
+ SYBORG_GRAPHICSWRAPPER_API int set_GraphicsCallBack( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, int (*aGraphicsCallBack) (int) )
+ {
+ m_pythonCallBack = aGraphicsCallBack;
+ // Change to proper error handling
+ return 0;
+ }
+
+ SYBORG_GRAPHICSWRAPPER_API int reset_SyborgGraphicsWrapper( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t *aGraphicsMemBase, uint32_t *aCommandMemBase )
+ {
+ return aSyborgGraphicsWrapper->Reset( aGraphicsMemBase, aCommandMemBase );
+ }
+
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferTail( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->InputBufferTail();
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferHead( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->InputBufferHead( );
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferReadCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->InputBufferReadCount( );
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputBufferWriteCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->InputBufferWriteCount( );
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_InputMaxTailIndex( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->InputMaxTailIndex( );
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_cmd_memsize( void )
+ {
+ return (VVI_PARAMETERS_INPUT_MEMORY_SIZE +
+ VVI_PARAMETERS_OUTPUT_MEMORY_SIZE);
+ }
+ SYBORG_GRAPHICSWRAPPER_API uint32_t get_framebuffer_memsize( void )
+ {
+ return VVI_SURFACEBUFFER_BASE_ADDRESS;
+ }
+
+
+ SYBORG_GRAPHICSWRAPPER_API unsigned int execute_command( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ return m_wrapper->Execute( );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void set_InputBufferTail( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal )
+ {
+ m_wrapper->SetInputBufferTail( aVal );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void set_InputBufferHead( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal )
+ {
+ m_wrapper->SetInputBufferHead( aVal );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void set_InputBufferReadCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal )
+ {
+ m_wrapper->SetInputBufferReadCount( aVal );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void set_InputBufferWriteCount( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal )
+ {
+ m_wrapper->SetInputBufferWriteCount( aVal );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void set_InputMaxTailIndex( SyborgGraphicsWrapper* aSyborgGraphicsWrapper, uint32_t aVal )
+ {
+ m_wrapper->SetInputMaxTailIndex( aVal );
+ }
+ SYBORG_GRAPHICSWRAPPER_API void signal_outputbuffer_semafore( SyborgGraphicsWrapper* aSyborgGraphicsWrapper )
+ {
+ #ifdef KHRONOS_API_W_MULTITHREAD
+ Psu::platform_signal_semaphore(m_outputBufferSemaphore);
+ #endif
+ }
+
+ }
--- a/holdingarea/vg/2D_OpenVG_1_1_SF/CMakeLists.txt Fri Sep 24 13:15:40 2010 +0100
+++ b/holdingarea/vg/2D_OpenVG_1_1_SF/CMakeLists.txt Fri Sep 24 13:29:27 2010 +0100
@@ -66,7 +66,7 @@
set(LIB_TYPE SHARED)
- link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib)
+ #link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib)
#if(CMAKE_BUILD_TYPE STREQUAL Release)
# link_directories(${PROJECT_SOURCE_DIR}/llvm/llvm-2.7/lib/Release)
#else(CMAKE_BUILD_TYPE STREQUAL Release)