|
@@ -7,6 +7,7 @@ from platform_methods import run_in_subprocess
|
|
import platform_windows_builders
|
|
import platform_windows_builders
|
|
|
|
|
|
common_win = [
|
|
common_win = [
|
|
|
|
+ "godot_win.cpp",
|
|
"context_gl_win.cpp",
|
|
"context_gl_win.cpp",
|
|
"crash_handler_win.cpp",
|
|
"crash_handler_win.cpp",
|
|
"os_windows.cpp",
|
|
"os_windows.cpp",
|
|
@@ -17,17 +18,17 @@ common_win = [
|
|
"windows_terminal_logger.cpp"
|
|
"windows_terminal_logger.cpp"
|
|
]
|
|
]
|
|
|
|
|
|
-restarget = "godot_res" + env["OBJSUFFIX"]
|
|
|
|
|
|
+res_file = 'godot_res.rc'
|
|
|
|
|
|
-obj = env.RES(restarget, 'godot_res.rc')
|
|
|
|
|
|
+res_target = "godot_res" + env["OBJSUFFIX"]
|
|
|
|
|
|
-common_win.append(obj)
|
|
|
|
|
|
+res_obj = env.RES(res_target, res_file)
|
|
|
|
|
|
-prog = env.add_program('#bin/godot', ['godot_win.cpp'] + common_win, PROGSUFFIX=env["PROGSUFFIX"])
|
|
|
|
|
|
+prog = env.add_program('#bin/godot', common_win + res_obj, PROGSUFFIX=env["PROGSUFFIX"])
|
|
|
|
|
|
# Microsoft Visual Studio Project Generation
|
|
# Microsoft Visual Studio Project Generation
|
|
if env['vsproj']:
|
|
if env['vsproj']:
|
|
- env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
|
|
|
|
|
|
+ env.vs_srcs = env.vs_srcs + ["platform/windows/" + res_file]
|
|
for x in common_win:
|
|
for x in common_win:
|
|
env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)]
|
|
env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)]
|
|
|
|
|