胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
b4057916 1 parent efb73c54

add qt project file. fix cmake file for clion.

内嵌 并排对比
正在显示 6 个修改的文件 包含 241 行增加 和 2 行删除
1 cmake_minimum_required(VERSION 2.6.4) 1 cmake_minimum_required(VERSION 2.6.4)
2 project(srs CXX) 2 project(srs CXX)
3 3
4 -INCLUDE_DIRECTORIES(objs objs/st objs/hp objs/openssl src/core src/kernel src/rtmp src/app) 4 +INCLUDE_DIRECTORIES(objs objs/st objs/hp objs/openssl/include src/core src/kernel src/rtmp src/app)
5 5
6 set(SOURCE_FILES src/main/srs_main_server.cpp) 6 set(SOURCE_FILES src/main/srs_main_server.cpp)
7 AUX_SOURCE_DIRECTORY(src/core SOURCE_FILES) 7 AUX_SOURCE_DIRECTORY(src/core SOURCE_FILES)
@@ -15,6 +15,7 @@ TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/st/libst.a) @@ -15,6 +15,7 @@ TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/st/libst.a)
15 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/openssl/lib/libssl.a) 15 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/openssl/lib/libssl.a)
16 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/openssl/lib/libcrypto.a) 16 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/openssl/lib/libcrypto.a)
17 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/hp/libhttp_parser.a) 17 TARGET_LINK_LIBRARIES(srs ${PROJECT_SOURCE_DIR}/objs/hp/libhttp_parser.a)
  18 +TARGET_LINK_LIBRARIES(srs -ldl)
18 19
19 IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a) 20 IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/objs/st/libst.a)
20 MESSAGE("srs_libs not found") 21 MESSAGE("srs_libs not found")
@@ -440,7 +440,7 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r) @@ -440,7 +440,7 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r)
440 unsigned int nb_current = 0; 440 unsigned int nb_current = 0;
441 unsigned int ticks = 0; 441 unsigned int ticks = 0;
442 unsigned int aveq = 0; 442 unsigned int aveq = 0;
443 - memset(name, sizeof(name), 0); 443 + memset(name, 0, sizeof(name));
444 444
445 sscanf(buf, "%4d %4d %31s %u %u %llu %u %u %u %llu %u %u %u %u", 445 sscanf(buf, "%4d %4d %31s %u %u %llu %u %u %u %llu %u %u %u %u",
446 &major, 446 &major,
  1 +TEMPLATE = app
  2 +CONFIG += console
  3 +CONFIG -= app_bundle
  4 +CONFIG -= qt
  5 +
  6 +HEADERS += \
  7 + ../../core/*.hpp \
  8 + ../../kernel/*.hpp \
  9 + ../../app/*.hpp \
  10 + ../../rtmp/*.hpp
  11 +
  12 +SOURCES += \
  13 + ../../core/*.cpp \
  14 + ../../kernel/*.cpp \
  15 + ../../app/*.cpp \
  16 + ../../rtmp/*.cpp \
  17 + ../../main/*.cpp
  18 +
  19 +INCLUDEPATH += \
  20 + ../../core \
  21 + ../../kernel \
  22 + ../../app \
  23 + ../../rtmp \
  24 + ../../../objs \
  25 + ../../../objs/st \
  26 + ../../../objs/hp \
  27 + ../../../objs/openssl/include
  28 +
  29 +LIBS += \
  30 + ../../../objs/st/libst.a \
  31 + ../../../objs/hp/libhttp_parser.a \
  32 + ../../../objs/openssl/lib/libssl.a \
  33 + ../../../objs/openssl/lib/libcrypto.a \
  34 + -ldl
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE QtCreatorProject>
  3 +<!-- Written by QtCreator 3.1.1, 2014-11-30T15:48:20. -->
  4 +<qtcreator>
  5 + <data>
  6 + <variable>ProjectExplorer.Project.ActiveTarget</variable>
  7 + <value type="int">0</value>
  8 + </data>
  9 + <data>
  10 + <variable>ProjectExplorer.Project.EditorSettings</variable>
  11 + <valuemap type="QVariantMap">
  12 + <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
  13 + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
  14 + <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
  15 + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
  16 + <value type="QString" key="language">Cpp</value>
  17 + <valuemap type="QVariantMap" key="value">
  18 + <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
  19 + </valuemap>
  20 + </valuemap>
  21 + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
  22 + <value type="QString" key="language">QmlJS</value>
  23 + <valuemap type="QVariantMap" key="value">
  24 + <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
  25 + </valuemap>
  26 + </valuemap>
  27 + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
  28 + <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
  29 + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
  30 + <value type="int" key="EditorConfiguration.IndentSize">4</value>
  31 + <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
  32 + <value type="int" key="EditorConfiguration.MarginColumn">80</value>
  33 + <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
  34 + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
  35 + <value type="int" key="EditorConfiguration.PaddingMode">1</value>
  36 + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
  37 + <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
  38 + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
  39 + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
  40 + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
  41 + <value type="int" key="EditorConfiguration.TabSize">8</value>
  42 + <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
  43 + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
  44 + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
  45 + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
  46 + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
  47 + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
  48 + </valuemap>
  49 + </data>
  50 + <data>
  51 + <variable>ProjectExplorer.Project.PluginSettings</variable>
  52 + <valuemap type="QVariantMap"/>
  53 + </data>
  54 + <data>
  55 + <variable>ProjectExplorer.Project.Target.0</variable>
  56 + <valuemap type="QVariantMap">
  57 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
  58 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
  59 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{fa2d28f9-85de-4a75-8e79-69d805f974bf}</value>
  60 + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
  61 + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
  62 + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
  63 + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
  64 + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/winlin/git/simple-rtmp-server/trunk/src/qt/build-qt-Desktop-Debug</value>
  65 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
  66 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
  67 + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
  68 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
  69 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  70 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
  71 + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
  72 + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
  73 + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
  74 + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
  75 + </valuemap>
  76 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
  77 + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
  78 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
  79 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  80 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
  81 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
  82 + <value type="QString">-w</value>
  83 + <value type="QString">-r</value>
  84 + </valuelist>
  85 + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
  86 + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
  87 + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
  88 + </valuemap>
  89 + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
  90 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
  91 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  92 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
  93 + </valuemap>
  94 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
  95 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
  96 + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
  97 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
  98 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  99 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
  100 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
  101 + <value type="QString">-w</value>
  102 + <value type="QString">-r</value>
  103 + </valuelist>
  104 + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
  105 + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
  106 + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
  107 + </valuemap>
  108 + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
  109 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
  110 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  111 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
  112 + </valuemap>
  113 + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
  114 + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
  115 + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
  116 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
  117 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  118 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
  119 + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
  120 + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
  121 + </valuemap>
  122 + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
  123 + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
  124 + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
  125 + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
  126 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
  127 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  128 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
  129 + </valuemap>
  130 + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
  131 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
  132 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  133 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
  134 + </valuemap>
  135 + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
  136 + <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
  137 + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
  138 + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
  139 + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
  140 + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
  141 + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
  142 + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
  143 + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
  144 + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
  145 + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
  146 + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
  147 + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
  148 + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
  149 + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
  150 + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
  151 + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
  152 + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
  153 + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
  154 + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
  155 + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
  156 + <value type="int">0</value>
  157 + <value type="int">1</value>
  158 + <value type="int">2</value>
  159 + <value type="int">3</value>
  160 + <value type="int">4</value>
  161 + <value type="int">5</value>
  162 + <value type="int">6</value>
  163 + <value type="int">7</value>
  164 + <value type="int">8</value>
  165 + <value type="int">9</value>
  166 + <value type="int">10</value>
  167 + <value type="int">11</value>
  168 + <value type="int">12</value>
  169 + <value type="int">13</value>
  170 + <value type="int">14</value>
  171 + </valuelist>
  172 + <value type="int" key="PE.EnvironmentAspect.Base">2</value>
  173 + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
  174 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">srs-qt</value>
  175 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
  176 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/simple-rtmp-server/trunk/src/qt/srs/srs-qt.pro</value>
  177 + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments">-c conf/console.conf</value>
  178 + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">srs-qt.pro</value>
  179 + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
  180 + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
  181 + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">/home/winlin/git/simple-rtmp-server/trunk</value>
  182 + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
  183 + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
  184 + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
  185 + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
  186 + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
  187 + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
  188 + </valuemap>
  189 + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
  190 + </valuemap>
  191 + </data>
  192 + <data>
  193 + <variable>ProjectExplorer.Project.TargetCount</variable>
  194 + <value type="int">1</value>
  195 + </data>
  196 + <data>
  197 + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
  198 + <value type="QByteArray">{67c55164-ec8b-40af-90ff-d8b0b02de43a}</value>
  199 + </data>
  200 + <data>
  201 + <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
  202 + <value type="int">15</value>
  203 + </data>
  204 +</qtcreator>