Skip to content

Commit 241c940

Browse files
committed
arrrrrrgh
1 parent e360428 commit 241c940

File tree

3 files changed

+69
-8
lines changed

3 files changed

+69
-8
lines changed

make-msc-module.tscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ function: buildLibraryMSC($name, $libraries, $definitions, $includes, $ldFlags,
435435
console.printLine()
436436
end
437437

438-
function: buildExecutablesMSC($libraries, $definitions, $includes, $ldFlags, $files, $optional)
439-
console.printLine("Building executables")
438+
function: buildExecutablesMSC($name, $libraries, $definitions, $includes, $ldFlags, $files, $optional)
439+
console.printLine("Building executables: " + $name)
440440
console.printLine()
441441

442442
$librariesIncludes = ""

make-unix-module.tscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ function: buildLibraryUnix($name, $libraries, $definitions, $includes, $ldFlags,
266266
console.printLine()
267267
end
268268

269-
function: buildExecutablesUnix($libraries, $definitions, $includes, $ldFlags, $files, $optional)
270-
console.printLine("Building executables")
269+
function: buildExecutablesUnix($name, $libraries, $definitions, $includes, $ldFlags, $files, $optional)
270+
console.printLine("Building executables: " + $name)
271271
console.printLine()
272272

273273
$librariesIncludes = ""

make.tscript

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function: clean()
2424
end
2525

2626
function: printUsage()
27-
console.printLine("Usage: minitscript [clean] [libraries] [executables]")
27+
console.printLine("Usage: minitscript [clean] [libraries] [tests] [executables]")
2828
end
2929

3030
function: main()
@@ -54,7 +54,9 @@ function: main()
5454
clean()
5555
end
5656

57-
if (application.getArguments()->contains("libraries") == true || application.getArguments()->contains("executables") == true)
57+
if (application.getArguments()->contains("libraries") == true ||
58+
application.getArguments()->contains("executables") == true ||
59+
application.getArguments()->contains("tests") == true)
5860
$minitScriptLdFlags = ""
5961
$minitScriptDefinitions = ""
6062
$yannetLdFlags = ""
@@ -75,7 +77,8 @@ function: main()
7577
$glfwDefinitions = ""
7678
$rapidJSONDefinitions = "-D RAPIDJSON_HAS_STDSTRING"
7779
$executableDefinitions = ""
78-
$executableLdFlags = "-Llib -pthread -lminitscript -lyannet -ltdme-ext -lagui -ltdme -ltdme-editor -ltdme-tests"
80+
$executableLdFlags = "-Llib -pthread -lminitscript -lyannet -ltdme-ext -lagui -ltdme -ltdme-tools"
81+
$executableTestLdFlags = "-Llib -pthread -lminitscript -lyannet -ltdme-ext -lagui -ltdme -ltdme-tests"
7982
$buildLibrary = "buildLibraryUnix"
8083
$buildExecutables = "buildExecutablesUnix"
8184
if ($$.application::OS == "FreeBSD")
@@ -182,6 +185,15 @@ function: main()
182185
$executableLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme-ext.lib\""
183186
$executableLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libagui.lib\""
184187
$executableLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme.lib\""
188+
$executableLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme-tools.lib\""
189+
$executableTestLdFlags = ""
190+
$executableTestLdFlags = "/LIBPATH \"ext/fbx/win64/lib/libfbxsdk.lib\""
191+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libminitscript.lib\""
192+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libyannet.lib\""
193+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme-ext.lib\""
194+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libagui.lib\""
195+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme.lib\""
196+
$executableTestLdFlags = $executableLdFlags + " " + "/LIBPATH \"lib/libtdme-tests.lib\""
185197
elseif ($$.application::OS == "Windows-MINGW")
186198
$yannetPlatformFiles = [
187199
"ext/yannet/src/yannet/os/network/platform/fallback/KernelEventMechanism.cpp"
@@ -912,7 +924,7 @@ function: main()
912924

913925
script.call(
914926
$buildLibrary,
915-
"libtdme-editor",
927+
"libtdme-tools",
916928
[
917929
],
918930
$rapidJSONDefinitions + " " + $glfwDefinitions + " " + $tdmeExtraLibsDefinitions,
@@ -1138,9 +1150,58 @@ function: main()
11381150
)
11391151
end
11401152

1153+
if (application.getArguments()->contains("tests") == true)
1154+
script.call(
1155+
$buildExecutables,
1156+
"tests",
1157+
[
1158+
"glfw3",
1159+
"openal",
1160+
"freetype2",
1161+
"libssl",
1162+
"libcrypto"
1163+
],
1164+
$rapidJSONDefinitions + " " + $glfwDefinitions + " " + $executableDefinitions,
1165+
"-Isrc -Iext -I. -Iext/reactphysics3d/include/ -Iext/vhacd/include/ -Iext/cpp-spline/src -Iext/zlib -Iext/yannet/src -Iext/minitscript/src -Iext/a-gui/src",
1166+
$executableTestLdFlags,
1167+
[
1168+
"src/tdme/tests/AudioTest-main.cpp",
1169+
"src/tdme/tests/ContainerTest-main.cpp",
1170+
"src/tdme/tests/CrashTest-main.cpp",
1171+
"src/tdme/tests/EngineTest-main.cpp",
1172+
"src/tdme/tests/EntityHierarchyTest-main.cpp",
1173+
"src/tdme/tests/HTTPClientTest-main.cpp",
1174+
"src/tdme/tests/HTTPDownloadClientTest-main.cpp",
1175+
"src/tdme/tests/LODTest-main.cpp",
1176+
"src/tdme/tests/FlowMapTest-main.cpp",
1177+
"src/tdme/tests/FlowMapTest2-main.cpp",
1178+
"src/tdme/tests/FoliageTest-main.cpp",
1179+
"src/tdme/tests/MathOperatorTest-main.cpp",
1180+
"src/tdme/tests/MinitScriptTest-main.cpp",
1181+
"src/tdme/tests/PathFindingTest-main.cpp",
1182+
"src/tdme/tests/PhysicsTest1-main.cpp",
1183+
"src/tdme/tests/PhysicsTest2-main.cpp",
1184+
"src/tdme/tests/PhysicsTest3-main.cpp",
1185+
"src/tdme/tests/PhysicsTest4-main.cpp",
1186+
"src/tdme/tests/PhysicsTest5-main.cpp",
1187+
"src/tdme/tests/RayTracingTest-main.cpp",
1188+
"src/tdme/tests/SkinningTest-main.cpp",
1189+
"src/tdme/tests/SplineTest-main.cpp",
1190+
"src/tdme/tests/TextureAtlasTest-main.cpp",
1191+
"src/tdme/tests/ThreadingTest-main.cpp",
1192+
"src/tdme/tests/TreeTest-main.cpp",
1193+
"src/tdme/tests/UDPClientTest-main.cpp",
1194+
"src/tdme/tests/UDPServerTest-main.cpp",
1195+
"src/tdme/tests/VideoTest-main.cpp",
1196+
"src/tdme/tests/WaterTest-main.cpp"
1197+
],
1198+
false
1199+
)
1200+
end
11411201

11421202
if (application.getArguments()->contains("executables") == true)
11431203
script.call(
1204+
"executables",
11441205
$buildExecutables,
11451206
[
11461207
"glfw3",

0 commit comments

Comments
 (0)