Commit b3b8d87f authored by Emmanuel Taurel's avatar Emmanuel Taurel
Browse files

- Some changes in Windows 64 bits project

parent 30de136f

TangoAccessControl/vc10_proj/Class_lib.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ C:\tango_src\AbstractClasses\AccessControl; 
    <ClCompile>

      <Optimization>Disabled</Optimization>

      <WholeProgramOptimization>false</WholeProgramOptimization>

      <AdditionalIncludeDirectories>..;$(TANGO_ROOT)\win64\include\vc10;$(TANGO_ROOT)\classes\win64_vc10\win64\include;C:\Program Files\MySQL\MySQL Server 5.5\include;TemplateAbstractPath;%(AdditionalIncludeDirectories);C:\tango_src\AbstractClasses\AccessControl</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..;S:\tango\ci\Tango\win64\include;$(ZMQ_BASE)\win64\include;$(TANGO_ROOT)\win64\include\vc10;$(TANGO_ROOT)\classes\win64_vc10\win64\include;C:\Program Files\MySQL\MySQL Server 5.5\include;TemplateAbstractPath;%(AdditionalIncludeDirectories);C:\tango_src\AbstractClasses\AccessControl</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>WIN32;_WINSTATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

TangoAccessControl/vc10_proj/Class_lib.vcxproj.filters

+0 −9
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
    <ClCompile Include="..\TangoAccessControl.cpp" />

    <ClCompile Include="..\TangoAccessControlClass.cpp" />

    <ClCompile Include="..\TangoAccessControlStateMachine.cpp" />

    <ClCompile Include="\tango_src\AbstractClasses\AccessControl/AccessControl.cpp" />

    <ClCompile Include="\tango_src\AbstractClasses\AccessControl/AccessControlClass.cpp" />

    <ClCompile Include="\tango_src\AbstractClasses\AccessControl/AccessControlStateMachine.cpp" />

    <ClCompile Include="C:\tango_src\AbstractClasses\AccessControl/AccessControl.cpp" />

    <ClCompile Include="C:\tango_src\AbstractClasses\AccessControl/AccessControlClass.cpp" />

    <ClCompile Include="C:\tango_src\AbstractClasses\AccessControl/AccessControlStateMachine.cpp" />
@@ -19,12 +16,6 @@ 
    <ClInclude Include="..\TangoAccessControlClass.h">

      <Filter>Header Files</Filter>

    </ClInclude>

    <ClInclude Include="\tango_src\AbstractClasses\AccessControl/AccessControl.h">

      <Filter>Header Files</Filter>

    </ClInclude>

    <ClInclude Include="\tango_src\AbstractClasses\AccessControl/AccessControlClass.h">

      <Filter>Header Files</Filter>

    </ClInclude>

    <ClInclude Include="C:\tango_src\AbstractClasses\AccessControl/AccessControl.h" />

    <ClInclude Include="C:\tango_src\AbstractClasses\AccessControl/AccessControlClass.h" />

  </ItemGroup>

TangoAccessControl/vc10_proj/Server_static.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ C;\tango_src\AbstractClasses\AccessControl; 
    <ClCompile>

      <Optimization>Disabled</Optimization>

      <WholeProgramOptimization>false</WholeProgramOptimization>

      <AdditionalIncludeDirectories>C:\Program Files\MySQL\MySQL Server 5.5\include;..;$(TANGO_ROOT)\win64\include\vc10;$(TANGO_ROOT)\classes\win64_vc10\win64\include;TemplateAbstractPath;%(AdditionalIncludeDirectories);C;\tango_src\AbstractClasses\AccessControl</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..;S:\tango\ci\Tango\win64\include;$(ZMQ_BASE)\win64\include;$(TANGO_ROOT)\win64\include\vc10;C:\Program Files\MySQL\MySQL Server 5.5\include;$(TANGO_ROOT)\classes\win64_vc10\win64\include;TemplateAbstractPath;C:\tango_src\AbstractClasses\AccessControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>WIN32;_WINSTATIC;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -216,7 +216,7 @@ C;\tango_src\AbstractClasses\AccessControl; 
    <Link>

      <AdditionalDependencies>TangoAccessControl.lib;mysqlclient.lib;omniORB4.lib;omniDynamic4.lib;COS4.lib;omnithread.lib;tango.lib;zmq.lib;log4tango.lib;comctl32.lib;ws2_32.lib;mswsock.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>

      <OutputFile>$(OutDir)TangoAccessControl.exe</OutputFile>

      <AdditionalLibraryDirectories>C:\Program Files\MySQL\MySQL Server 5.5\lib;..\lib\win64\release;$(TANGO_ROOT)\win64\lib\vc10;$(TANGO_ROOT)\classes\win64_vc10\win64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <AdditionalLibraryDirectories>..\lib\win64\release;C:\Program Files\MySQL\MySQL Server 5.5\lib;S:\tango\ci\Tango\win64\lib\vc10;$(ZMQ_BASE)\win64\lib\vc10;$(TANGO_ROOT)\win64\lib\vc10;$(TANGO_ROOT)\classes\win64_vc10\win64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

      <GenerateDebugInformation>false</GenerateDebugInformation>

      <SubSystem>Console</SubSystem>

      <OptimizeReferences>