premake5 functions

Ohjurot · Ohjurot · commit 59f32333df19 · 2023-02-19T17:35:26.000+01:00
diff --git a/01_SimpleCApp/build.lua b/01_SimpleCApp/build.lua
@@ -0,0 +1 @@
+cpptNewProject("01_SimpleCApp")
diff --git a/02_Pointers/build.lua b/02_Pointers/build.lua
@@ -0,0 +1 @@
+cpptNewProject("02_Pointers")
diff --git a/03_MemoryUtils/build.lua b/03_MemoryUtils/build.lua
@@ -0,0 +1 @@
+cpptNewProject("03_MemoryUtils")
diff --git a/04_INIParser/INIApi.h b/04_INIParser/INIApi.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef INI_BUILD_DLL
+#ifdef __04_INIParser_BUILD_DLL
 #define INI_API __declspec(dllexport)
 #else
 #define INI_API __declspec(dllimport)
diff --git a/04_INIParser/build.lua b/04_INIParser/build.lua
@@ -0,0 +1,2 @@
+cpptNewProject("04_INIParser")
+cpptSetSharedLib()
diff --git a/05_INIExplorer/build.lua b/05_INIExplorer/build.lua
@@ -0,0 +1,4 @@
+cpptNewProject("05_INIExplorer")
+defines { "INIEXPLORER_DEFAULT_FORMAT1" }
+links { "04_INIParser" }
+debugargs { "config.ini" }
diff --git a/05_INIExplorer/main.c b/05_INIExplorer/main.c
@@ -1,4 +1,4 @@
-#include <INIx.h>
+#include <04_INIParser/INIx.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/06_AdvancedCStructs/build.lua b/06_AdvancedCStructs/build.lua
@@ -0,0 +1 @@
+cpptNewProject("06_AdvancedCStructs")
diff --git a/07_SimpleCppApp/build.lua b/07_SimpleCppApp/build.lua
@@ -0,0 +1 @@
+cpptNewProject("07_SimpleCppApp")
diff --git a/08_CatsAndDogs/build.lua b/08_CatsAndDogs/build.lua
@@ -0,0 +1 @@
+cpptNewProject("08_CatsAndDogs")
diff --git a/09_INIpp/build.lua b/09_INIpp/build.lua
@@ -0,0 +1 @@
+cpptNewProject("09_INIpp")
diff --git a/Exercises/E01_Functions/build.lua b/Exercises/E01_Functions/build.lua
@@ -0,0 +1 @@
+cpptNewProject("E01_Functions", "Exercises/E01_Functions")
diff --git a/cpptutorial.lua b/cpptutorial.lua
@@ -0,0 +1,39 @@
+function cpptNewProject(projectName, src)
+    srcdir = projectName
+    if src ~= nil then
+        srcdir = src
+    end
+
+    project(projectName)
+        kind "ConsoleApp"
+        language "C++"
+        cppdialect "C++20"
+
+        targetdir "%{wks.location}/build/bin/%{cfg.architecture}-%{cfg.buildcfg}/"
+        objdir "%{wks.location}/build/obj/%{cfg.architecture}-%{cfg.buildcfg}/%{prj.name}/"
+
+        location("%{wks.location}/" .. srcdir)
+        files { 
+            "%{prj.location}/**.h", "%{prj.location}/**.hpp", "%{prj.location}/**.hh", "%{prj.location}/**.hxx",  
+            "%{prj.location}/**.c", "%{prj.location}/**.cpp", "%{prj.location}/**.cc", "%{prj.location}/**.cxx",
+            "%{prj.location}/**.lua", "%{prj.location}/**.txt", "%{prj.location}/**.md", "%{prj.location}/**.ini",
+        }
+        includedirs { "%{wks.location}", "%{prj.location}" }
+
+        defines { "__%{prj.name}_BUILD" }
+
+        filter "configurations:Debug"
+            defines { "DEBUG", "_DEBUG" }
+            symbols "On"
+        filter {}
+
+        filter "configurations:Release"
+            defines { "NDEBUG" }
+            optimize "On"
+        filter {}
+end
+
+function cpptSetSharedLib()
+    kind "SharedLib"
+    defines { "__%{prj.name}_BUILD_DLL" }
+end
diff --git a/premake5.lua b/premake5.lua
@@ -1,30 +1,20 @@
+include "cpptutorial.lua"
+
 workspace "CppTutorial"
     configurations { "Debug", "Release" }
     architecture "x64"
     location "./"
 
-    projectName = "08_CatsAndDogs"
-    project(projectName)
-        kind "ConsoleApp"
-        language "C++"
-        cppdialect "C++20"
-
-        targetdir "%{wks.location}/build/bin/%{cfg.architecture}-%{cfg.buildcfg}/"
-        objdir "%{wks.location}/build/obj/%{cfg.architecture}-%{cfg.buildcfg}/%{prj.name}/"
-
-        location("%{wks.location}/" .. projectName)
-        files { 
-            "%{prj.location}/**.h", "%{prj.location}/**.hpp", "%{prj.location}/**.hh", "%{prj.location}/**.hxx",  
-            "%{prj.location}/**.c", "%{prj.location}/**.cpp", "%{prj.location}/**.cc", "%{prj.location}/**.cxx",
-            "%{prj.location}/**.lua", "%{prj.location}/**.txt", "%{prj.location}/**.md", "%{prj.location}/**.ini",
-        }
-
-        filter "configurations:Debug"
-            defines { "DEBUG", "_DEBUG" }
-            symbols "On"
-        filter {}
+    include "./01_SimpleCApp/build.lua"
+    include "./02_Pointers/build.lua"
+    include "./03_MemoryUtils/build.lua"
+    include "./04_INIParser/build.lua"
+    include "./05_INIExplorer/build.lua"
+    include "./06_AdvancedCStructs/build.lua"
+    include "./07_SimpleCppApp/build.lua"
+    include "./08_CatsAndDogs/build.lua"
+    include "./09_INIpp/build.lua"
 
-        filter "configurations:Release"
-            defines { "NDEBUG" }
-            optimize "On"
-        filter {}
+    group "Exercises"
+        include "./Exercises/E01_Functions/build.lua"
+    group ""

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+cpptNewProject("04_INIParser")`
	`2`	`+cpptSetSharedLib()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <INIx.h>`
	`1`	`+#include <04_INIParser/INIx.h>`
`2`	`2`
`3`	`3`	`#include <stdio.h>`
`4`	`4`	`#include <string.h>`