Skip to content

Commit dc2c49a

Browse files
committed
fix(carpntr): do not use linker arguments in windows to enable gui builds, fix is to be determined later
1 parent ee206cc commit dc2c49a

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

compiler/carpntr/configuration.yaka

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@
55
# Note: libs - MIT license, runtime/3rd - various
66
# ==============================================================================================
77
# GPLv3:
8-
#
8+
#
99
# Yaksha - Programming Language.
1010
# Copyright (C) 2020 - 2024 Bhathiya Perera
11-
#
11+
#
1212
# This program is free software: you can redistribute it and/or modify it under the terms
1313
# of the GNU General Public License as published by the Free Software Foundation,
1414
# either version 3 of the License, or (at your option) any later version.
15-
#
15+
#
1616
# This program is distributed in the hope that it will be useful,
1717
# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1818
# or FITNESS FOR A PARTICULAR PURPOSE.
1919
# See the GNU General Public License for more details.
20-
#
20+
#
2121
# You should have received a copy of the GNU General Public License along with this program.
2222
# If not, see https://www.gnu.org/licenses/.
23-
#
23+
#
2424
# ==============================================================================================
2525
# Additional Terms:
26-
#
26+
#
2727
# Please note that any commercial use of the programming language's compiler source code
2828
# (everything except compiler/runtime, compiler/libs and compiler/3rd) require a written agreement
2929
# with author of the language (Bhathiya Perera).
30-
#
30+
#
3131
# If you are using it for an open source project, please give credits.
3232
# Your own project must use GPLv3 license with these additional terms.
33-
#
33+
#
3434
# You may use programs written in Yaksha/YakshaLisp for any legal purpose
3535
# (commercial, open-source, closed-source, etc) as long as it agrees
3636
# to the licenses of linked runtime libraries (see compiler/runtime/README.md).
37-
#
37+
#
3838
# ==============================================================================================
3939
import libs.strings.array as sarr
4040
import libs.strings

compiler/carpntr/main.yaka.c

-1
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,6 @@ yk__sds* yy__raylib_support_get_raylib_args(struct yy__configuration_Config* yy_
690690
yy__raylib_support_arguments = yy__array_extend(yy__raylib_support_arguments, yy__raylib_support_o_files);
691691
if (yy__os_is_windows())
692692
{
693-
yk__arrput(yy__raylib_support_arguments, yk__sdsnewlen("-Wl,--subsystem,windows", 23));
694693
yk__arrput(yy__raylib_support_arguments, yk__sdsnewlen("-DYK__WINDOWS_HIDE_CONSOLE", 26));
695694
}
696695
}

compiler/carpntr/raylib_support.yaka

+11-13
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@
55
# Note: libs - MIT license, runtime/3rd - various
66
# ==============================================================================================
77
# GPLv3:
8-
#
8+
#
99
# Yaksha - Programming Language.
1010
# Copyright (C) 2020 - 2024 Bhathiya Perera
11-
#
11+
#
1212
# This program is free software: you can redistribute it and/or modify it under the terms
1313
# of the GNU General Public License as published by the Free Software Foundation,
1414
# either version 3 of the License, or (at your option) any later version.
15-
#
15+
#
1616
# This program is distributed in the hope that it will be useful,
1717
# but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1818
# or FITNESS FOR A PARTICULAR PURPOSE.
1919
# See the GNU General Public License for more details.
20-
#
20+
#
2121
# You should have received a copy of the GNU General Public License along with this program.
2222
# If not, see https://www.gnu.org/licenses/.
23-
#
23+
#
2424
# ==============================================================================================
2525
# Additional Terms:
26-
#
26+
#
2727
# Please note that any commercial use of the programming language's compiler source code
2828
# (everything except compiler/runtime, compiler/libs and compiler/3rd) require a written agreement
2929
# with author of the language (Bhathiya Perera).
30-
#
30+
#
3131
# If you are using it for an open source project, please give credits.
3232
# Your own project must use GPLv3 license with these additional terms.
33-
#
33+
#
3434
# You may use programs written in Yaksha/YakshaLisp for any legal purpose
3535
# (commercial, open-source, closed-source, etc) as long as it agrees
3636
# to the licenses of linked runtime libraries (see compiler/runtime/README.md).
37-
#
37+
#
3838
# ==============================================================================================
3939
# Add support for building raylib projects
4040

@@ -291,10 +291,8 @@ def get_raylib_args(conf: carp.Config, build_path: str) -> Array[str]:
291291
arguments = sarr.extend(arguments, o_files)
292292
# On windows try and build a gui application so it will not annoy us
293293
if os.is_windows():
294-
arrput(arguments, "-Wl,--subsystem,windows")
295-
# Fix until zig support ^^ Windows subsystem
296-
# Basically when this #define is set we hide the console window.
297-
# However, this does not work if you are using the new Windows Terminal
294+
# arrput(arguments, "-Wl,--subsystem,windows")
295+
# unfortunately above does not work, so we have to hide the console manually
298296
arrput(arguments, "-DYK__WINDOWS_HIDE_CONSOLE")
299297

300298
# Add includes

0 commit comments

Comments
 (0)