Adjusted template.

This commit is contained in:
Patrick 2024-09-09 21:59:51 +02:00
parent 5462d2316e
commit a8813349a1
4 changed files with 37 additions and 27 deletions

53
.idea/workspace.xml generated
View File

@ -12,7 +12,12 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="47989f6f-f370-4d63-b72a-bbc574e0808a" name="Changes" comment="" /> <list default="true" id="47989f6f-f370-4d63-b72a-bbc574e0808a" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/SConstruct" beforeDir="false" afterPath="$PROJECT_DIR$/SConstruct" afterDir="false" />
<change beforePath="$PROJECT_DIR$/private/spp_template/SModule" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/private/spp_template/main.cpp" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -27,14 +32,14 @@
<entry> <entry>
<key> <key>
<ExternalProjectPojo> <ExternalProjectPojo>
<option name="name" value="spp_template" /> <option name="name" value="sdl_gpu_test" />
<option name="path" value="$PROJECT_DIR$" /> <option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo> </ExternalProjectPojo>
</key> </key>
<value> <value>
<list> <list>
<ExternalProjectPojo> <ExternalProjectPojo>
<option name="name" value="spp_template" /> <option name="name" value="sdl_gpu_test" />
<option name="path" value="$PROJECT_DIR$" /> <option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo> </ExternalProjectPojo>
</list> </list>
@ -64,28 +69,29 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Custom Build Application.Debug.executor": "Debug", &quot;Custom Build Application.Debug.executor&quot;: &quot;Debug&quot;,
"RunOnceActivity.RadMigrateCodeStyle": "true", &quot;RunOnceActivity.RadMigrateCodeStyle&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.cidr.known.project.marker": "true", &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
"RunOnceActivity.readMode.enableVisualFormatting": "true", &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
"cf.first.check.clang-format": "false", &quot;cf.advertisement.text.has.clang-format&quot;: &quot;true&quot;,
"cidr.known.project.marker": "true", &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
"git-widget-placeholder": "master", &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
"last_opened_file_path": "/opt/daten/projects/C++/spp_template", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"node.js.detected.package.eslint": "true", &quot;last_opened_file_path&quot;: &quot;/home/mewin/Documents/projects/C++/sdl_gpu_test/compile_commands.json&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"settings.editor.selected.configurable": "CLionExternalConfigurable", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"vue.rearranger.settings.migration": "true" &quot;settings.editor.selected.configurable&quot;: &quot;CLionExternalConfigurable&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RunManager"> <component name="RunManager">
<configuration name="Debug" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="spp_template" TARGET_NAME="Scons Debug" CONFIG_NAME="Scons Debug" RUN_PATH="$PROJECT_DIR$/bin/spp_template"> <configuration name="Debug" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="sdl_gpu_test" TARGET_NAME="Scons Debug" CONFIG_NAME="Scons Debug" RUN_PATH="$PROJECT_DIR$/bin/sdl_gpu_test">
<method v="2"> <method v="2">
<option name="CLION.EXTERNAL.BUILD" enabled="true" /> <option name="CLION.EXTERNAL.BUILD" enabled="true" />
</method> </method>
@ -102,6 +108,7 @@
<workItem from="1718915338619" duration="23000" /> <workItem from="1718915338619" duration="23000" />
<workItem from="1718915550483" duration="442000" /> <workItem from="1718915550483" duration="442000" />
<workItem from="1718916001754" duration="8000" /> <workItem from="1718916001754" duration="8000" />
<workItem from="1725911967308" duration="1000" />
</task> </task>
<servers /> <servers />
</component> </component>

View File

@ -1,10 +1,10 @@
config = { config = {
'PROJECT_NAME': 'spp_template' 'PROJECT_NAME': 'sdl_gpu_test'
} }
env = SConscript('external/scons-plus-plus/SConscript', exports = ['config']) env = SConscript('external/scons-plus-plus/SConscript', exports = ['config'])
env.Append(CPPPATH = [Dir('private'), Dir('public')]) env.Append(CPPPATH = [Dir('private'), Dir('public')])
# app # app
env = env.Module('private/spp_template/SModule') env = env.Module('private/sdl_gpu_test/SModule')
env.Finalize() env.Finalize()

View File

@ -6,10 +6,13 @@ src_files = Split("""
""") """)
prog_app = env.UnityProgram( prog_app = env.UnityProgram(
target = env['BIN_DIR'] + '/spp_template', target = env['BIN_DIR'] + '/sdl_gpu_test',
source = src_files, source = src_files,
dependencies = { dependencies = {
'mijin': {} 'mijin': {},
'SDL': {
}
} }
) )
env.Default(prog_app) env.Default(prog_app)