Skip to content

Commit

Permalink
Merge pull request #14 from Ligo04/master
Browse files Browse the repository at this point in the history
添加xmake编译
  • Loading branch information
MKXJun authored Oct 11, 2024
2 parents 273f547 + a849f3a commit 63eb26c
Show file tree
Hide file tree
Showing 52 changed files with 948 additions and 121 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ x64/
.git/
.vs/
.vscode/
bin/
build/
backup/
lib/
vsxmake2022/
*.cso
*.mbo
*.inc
Expand All @@ -19,3 +21,4 @@ lib/
*.lastcodeanalysissucceeded
!dxtex.exe
*.exe
compile_commands.json
12 changes: 12 additions & 0 deletions ImGui/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
target("ImGui")
set_group("ImGui")
set_kind("static")
if is_mode("debug") then
set_targetdir(path.join(os.projectdir(),"bin/Debug/ImGui"))
else
set_targetdir(path.join(os.projectdir(),"bin/Release/ImGui"))
end
add_headerfiles("**.h")
add_files("**.cpp")
add_includedirs("./",{public = true})
target_end()
Binary file added MarkdownFiles/005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions Project 01-09/01 DirectX11 Initialization/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
targetName = "01_DirectX11_Initialization"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
target_end()
13 changes: 13 additions & 0 deletions Project 01-09/02 Rendering a Triangle/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
targetName = "02_Rendering_a_Triangle"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
--shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
target_end()
13 changes: 13 additions & 0 deletions Project 01-09/03 Rendering a Cube/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
targetName = "03_Rendering_a_Cube"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
--shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
target_end()
14 changes: 14 additions & 0 deletions Project 01-09/06 Use ImGui/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
targetName = "06_Use_ImGui"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_deps("ImGui")
add_headerfiles("**.h")
add_files("**.cpp")
--shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
target_end()
14 changes: 14 additions & 0 deletions Project 01-09/07 Lighting/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
targetName = "07_Lighting"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_deps("ImGui")
add_headerfiles("**.h")
add_files("**.cpp")
--shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
target_end()
13 changes: 13 additions & 0 deletions Project 01-09/08 Direct2D and Direct3D Interoperability/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
targetName = "08_Direct2D_and_Direct3D_Interoperability"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
--shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
target_end()
16 changes: 16 additions & 0 deletions Project 01-09/09 Texture Mapping/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
targetName = "09_Texture_Mapping"
target(targetName)
set_group("Project 01-09")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
12 changes: 12 additions & 0 deletions Project 01-09/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
if is_mode("debug") then
binDir = path.join(os.projectdir(),"bin/Debug/Project 01-09")
else
binDir = path.join(os.projectdir(),"bin/Release/Project 01-09")
end
includes("01 DirectX11 Initialization")
includes("02 Rendering a Triangle")
includes("03 Rendering a Cube")
includes("06 Use ImGui")
includes("07 Lighting")
includes("08 Direct2D and Direct3D Interoperability")
includes("09 Texture Mapping")
20 changes: 20 additions & 0 deletions Project 10-17/10 Camera/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "10_camera"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/11 Blending/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "11_Blending"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/12 Depth and Stenciling/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "12_Depth_and_Stenciling"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
5 changes: 5 additions & 0 deletions Project 10-17/13 Living Without FX11/imgui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ Pos=18,14
Size=332,165
Collapsed=0

[Window][Living without FX11]
Pos=60,60
Size=332,105
Collapsed=0

20 changes: 20 additions & 0 deletions Project 10-17/13 Living Without FX11/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "13_Living_Without_FX11"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/14 Depth Test/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "14_Depth_Test"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/15 Geometry Shader Beginning/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "15_Geometry_Shader_Beginning"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/16 Stream Output/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "16_Stream_Output"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
20 changes: 20 additions & 0 deletions Project 10-17/17 Tree Billboard/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
targetName = "17_Tree_Billboard"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_deps("ImGui")
add_rules("imguiini")
add_dx_sdk_options()
add_headerfiles("**.h")
add_files("**.cpp")
add_headerfiles("../Common/**.h")
add_files("../Common/**.cpp")
add_includedirs("../Common")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("HLSL/**.hlsl|HLSL/**.hlsli")
add_files("HLSL/**.hlsl|HLSL/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
13 changes: 13 additions & 0 deletions Project 10-17/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
if is_mode("debug") then
binDir = path.join(os.projectdir(),"bin/Debug/Project 10-17")
else
binDir = path.join(os.projectdir(),"bin/Release/Project 10-17")
end
includes("10 Camera")
includes("11 Blending")
includes("12 Depth and Stenciling")
includes("13 Living Without FX11")
includes("14 Depth Test")
includes("15 Geometry Shader Beginning")
includes("16 Stream Output")
includes("17 Tree Billboard")
17 changes: 17 additions & 0 deletions Project 19-/19 Meshes/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
targetName = "19_Meshes"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_rules("imguiini")
add_dx_sdk_options()
add_deps("Common")
add_headerfiles("**.h")
add_files("**.cpp")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("Shaders/**.hlsl|Shaders/**.hlsli")
add_files("Shaders/**.hlsl|Shaders/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
17 changes: 17 additions & 0 deletions Project 19-/20 Instancing and Frustum Culling/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
targetName = "20_Instancing_and_Frustum_Culling"
target(targetName)
set_group("Project 10-17")
set_kind("binary")
set_targetdir(path.join(binDir,targetName))
add_rules("imguiini")
add_dx_sdk_options()
add_deps("Common")
add_headerfiles("**.h")
add_files("**.cpp")
-- shader
add_rules("hlsl_shader_complier")
add_headerfiles("Shaders/**.hlsl|Shaders/**.hlsli")
add_files("Shaders/**.hlsl|Shaders/**.hlsli")
-- assert
add_rules("asset_file")
target_end()
Loading

0 comments on commit 63eb26c

Please sign in to comment.