Changeset 79


Ignore:
Timestamp:
08/17/10 10:25:14 (18 months ago)
Author:
jay
Message:

-- integrated svcconfig and svccontrol modules in the win32service application.

Location:
trunk/builders/VS2010/win32service
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/builders/VS2010/win32service/win32service.vcxproj

    r70 r79  
    1010      <Platform>Win32</Platform> 
    1111    </ProjectConfiguration> 
    12   </ItemGroup> 
    13   <ItemGroup> 
    14     <ClCompile Include="..\..\..\sources\applications\win32service\src\rtmpserver\rtmpserver.cpp" /> 
    15     <ClCompile Include="..\..\..\sources\applications\win32service\src\svc\Svc.cpp" /> 
    16   </ItemGroup> 
    17   <ItemGroup> 
    18     <ClInclude Include="..\..\..\sources\applications\win32service\include\rtmpserver\rtmpserver.h" /> 
    19     <ClInclude Include="..\..\..\sources\applications\win32service\include\svc\sample.h" /> 
    20     <ClInclude Include="..\..\..\sources\applications\win32service\include\svc\Svc.h" /> 
    2112  </ItemGroup> 
    2213  <ItemGroup> 
    … …  
    7970  </ItemGroup> 
    8071  <ItemGroup> 
    81     <None Include="..\..\..\sources\applications\win32service\Readme.txt" /> 
     72    <ClInclude Include="..\..\..\sources\win32service\svcconfig\include\svcconfig.h" /> 
     73    <ClInclude Include="..\..\..\sources\win32service\svccontrol\include\svccontrol.h" /> 
     74    <ClInclude Include="..\..\..\sources\win32service\win32service\include\rtmpserver\rtmpserver.h" /> 
     75    <ClInclude Include="..\..\..\sources\win32service\win32service\include\svc\svc.h" /> 
     76  </ItemGroup> 
     77  <ItemGroup> 
     78    <ClCompile Include="..\..\..\sources\win32service\svcconfig\src\svcconfig.cpp" /> 
     79    <ClCompile Include="..\..\..\sources\win32service\svccontrol\src\svccontrol.cpp" /> 
     80    <ClCompile Include="..\..\..\sources\win32service\win32service\src\rtmpserver\rtmpserver.cpp" /> 
     81    <ClCompile Include="..\..\..\sources\win32service\win32service\src\svc\svc.cpp" /> 
     82  </ItemGroup> 
     83  <ItemGroup> 
     84    <None Include="..\..\..\sources\win32service\win32service\readme.txt" /> 
    8285  </ItemGroup> 
    8386  <PropertyGroup Label="Globals"> 
    … …  
    123126      <Optimization>Disabled</Optimization> 
    124127      <PreprocessorDefinitions>LITTLE_ENDIAN_BYTE_ALIGNED;NET_SELECT;HAS_LUA;HAS_PROTOCOL_HTTP;HAS_PROTOCOL_RTMP;HAS_PROTOCOL_RTP;HAS_PROTOCOL_LIVEFLV;HAS_PROTOCOL_TS;HAS_PROTOCOL_VAR;HAS_MEDIA_MP3;HAS_MEDIA_MP4;HAS_MEDIA_FLV;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> 
    125       <AdditionalIncludeDirectories>..\..\..\sources\common\include;..\..\..\sources\thelib\include;..\..\..\3rdparty\lua-dev;..\..\..\sources\applications\win32service\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
     128      <AdditionalIncludeDirectories>..\..\..\sources\common\include;..\..\..\sources\thelib\include;..\..\..\3rdparty\lua-dev;..\..\..\sources\win32service\win32service\include;..\..\..\sources\win32service\svcconfig\include;..\..\..\sources\win32service\svccontrol\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 
    126129      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> 
    127130    </ClCompile> 

  • trunk/builders/VS2010/win32service/win32service.vcxproj.filters

    r70 r79  
    1010      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> 
    1111    </Filter> 
    12     <Filter Include="Source Files\svc"> 
    13       <UniqueIdentifier>{5b9f4aa4-3855-4214-be2e-a2215b1a85d0}</UniqueIdentifier> 
     12    <Filter Include="Header Files\svcconfig"> 
     13      <UniqueIdentifier>{41103c8d-cad8-40f6-83ef-373c0d2a8920}</UniqueIdentifier> 
    1414    </Filter> 
    15     <Filter Include="Source Files\rtmpserver"> 
     15    <Filter Include="Header Files\svccontrol"> 
     16      <UniqueIdentifier>{3ba17e12-aa0f-4686-a773-7113e2392d59}</UniqueIdentifier> 
     17    </Filter> 
     18    <Filter Include="Header Files\win32service"> 
     19      <UniqueIdentifier>{3328891b-7ba0-408d-b77b-c15e8bb928aa}</UniqueIdentifier> 
     20    </Filter> 
     21    <Filter Include="Header Files\win32service\rtmpserver"> 
     22      <UniqueIdentifier>{922b945e-f407-4be0-bc3f-85180ffdce03}</UniqueIdentifier> 
     23    </Filter> 
     24    <Filter Include="Header Files\win32service\svc"> 
     25      <UniqueIdentifier>{fbf006fe-14f6-42c3-9c58-cc8d78af69df}</UniqueIdentifier> 
     26    </Filter> 
     27    <Filter Include="Source Files\svccontrol"> 
     28      <UniqueIdentifier>{281cca0b-d181-4e94-948c-002a053b91ce}</UniqueIdentifier> 
     29    </Filter> 
     30    <Filter Include="Source Files\svcconfig"> 
     31      <UniqueIdentifier>{d340c3ec-9cde-4842-9609-e1074c31bf08}</UniqueIdentifier> 
     32    </Filter> 
     33    <Filter Include="Source Files\win32service"> 
     34      <UniqueIdentifier>{f0ba02d8-db69-4981-8850-826b74deb4a7}</UniqueIdentifier> 
     35    </Filter> 
     36    <Filter Include="Source Files\win32service\rtmpserver"> 
    1637      <UniqueIdentifier>{c75b42b4-16e4-4c37-8688-5ab541d031fe}</UniqueIdentifier> 
    1738    </Filter> 
    18     <Filter Include="Header Files\svc"> 
    19       <UniqueIdentifier>{fbf006fe-14f6-42c3-9c58-cc8d78af69df}</UniqueIdentifier> 
    20     </Filter> 
    21     <Filter Include="Header Files\rtmpserver"> 
    22       <UniqueIdentifier>{922b945e-f407-4be0-bc3f-85180ffdce03}</UniqueIdentifier> 
     39    <Filter Include="Source Files\win32service\svc"> 
     40      <UniqueIdentifier>{5b9f4aa4-3855-4214-be2e-a2215b1a85d0}</UniqueIdentifier> 
    2341    </Filter> 
    2442  </ItemGroup> 
    2543  <ItemGroup> 
    26     <ClCompile Include="..\..\..\sources\applications\win32service\src\svc\Svc.cpp"> 
    27       <Filter>Source Files\svc</Filter> 
     44    <ClInclude Include="..\..\..\sources\win32service\win32service\include\rtmpserver\rtmpserver.h"> 
     45      <Filter>Header Files\win32service\rtmpserver</Filter> 
     46    </ClInclude> 
     47    <ClInclude Include="..\..\..\sources\win32service\win32service\include\svc\svc.h"> 
     48      <Filter>Header Files\win32service\svc</Filter> 
     49    </ClInclude> 
     50    <ClInclude Include="..\..\..\sources\win32service\svccontrol\include\svccontrol.h"> 
     51      <Filter>Header Files\svccontrol</Filter> 
     52    </ClInclude> 
     53    <ClInclude Include="..\..\..\sources\win32service\svcconfig\include\svcconfig.h"> 
     54      <Filter>Header Files\svcconfig</Filter> 
     55    </ClInclude> 
     56  </ItemGroup> 
     57  <ItemGroup> 
     58    <ClCompile Include="..\..\..\sources\win32service\win32service\src\rtmpserver\rtmpserver.cpp"> 
     59      <Filter>Source Files\win32service\rtmpserver</Filter> 
    2860    </ClCompile> 
    29     <ClCompile Include="..\..\..\sources\applications\win32service\src\rtmpserver\rtmpserver.cpp"> 
    30       <Filter>Source Files\rtmpserver</Filter> 
     61    <ClCompile Include="..\..\..\sources\win32service\win32service\src\svc\svc.cpp"> 
     62      <Filter>Source Files\win32service\svc</Filter> 
     63    </ClCompile> 
     64    <ClCompile Include="..\..\..\sources\win32service\svcconfig\src\svcconfig.cpp"> 
     65      <Filter>Source Files\svcconfig</Filter> 
     66    </ClCompile> 
     67    <ClCompile Include="..\..\..\sources\win32service\svccontrol\src\svccontrol.cpp"> 
     68      <Filter>Source Files\svccontrol</Filter> 
    3169    </ClCompile> 
    3270  </ItemGroup> 
    3371  <ItemGroup> 
    34     <ClInclude Include="..\..\..\sources\applications\win32service\include\rtmpserver\rtmpserver.h"> 
    35       <Filter>Header Files\rtmpserver</Filter> 
    36     </ClInclude> 
    37     <ClInclude Include="..\..\..\sources\applications\win32service\include\svc\Svc.h"> 
    38       <Filter>Header Files\svc</Filter> 
    39     </ClInclude> 
    40     <ClInclude Include="..\..\..\sources\applications\win32service\include\svc\sample.h"> 
    41       <Filter>Header Files\svc</Filter> 
    42     </ClInclude> 
    43   </ItemGroup> 
    44   <ItemGroup> 
    45     <None Include="..\..\..\sources\applications\win32service\Readme.txt" /> 
     72    <None Include="..\..\..\sources\win32service\win32service\readme.txt" /> 
    4673  </ItemGroup> 
    4774</Project> 
Note: See TracChangeset for help on using the changeset viewer.