-
-
Notifications
You must be signed in to change notification settings - Fork 29
To fix Issue#2164, create infrastructure to compile Maiko for Windows System for Linux v1 as a separate OS from Linux #536
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
834a608
WIP. Moving to WSL1 environment
fghalasz 6d171bf
Create/update additional makefiles for building maiko for WSL1. Upda…
fghalasz 59953c2
Fix error is Dockerfile_maiko for wsl1
fghalasz 5d3639a
Fix another error is Dockerfile_maiko for wsl1
fghalasz 389ecf7
Fix Dockerfile_maiko so osversion is restored after building the wsl1…
fghalasz 7dd3c90
Fix up various makefile-wsl (and -cygwin) errors pointed out by gemin…
fghalasz b029b98
Fix Dockerfile_maiko to set execute permissions on osversion while bu…
fghalasz 5dc9233
One more typo in Dockerfile_maiko
fghalasz 6aafbbc
Enable using LDEARCH to set wsl1 as the osversion. Set LDEARCH to ge…
fghalasz 8e17c07
Fix typo in Dockerfile_maiko
fghalasz 6f42b35
In Dockerfile_maiko, for wsl1 case called makeright XX clean twice. …
fghalasz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Options for Windows System for Linux v1, aarch64 processor, X windows, for INIT processing | ||
|
||
CC = gcc $(GCC_CFLAGS) | ||
#CC = clang $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)xmkicon.o \ | ||
$(OBJECTDIR)xbbt.o \ | ||
$(OBJECTDIR)dspif.o \ | ||
$(OBJECTDIR)xinit.o \ | ||
$(OBJECTDIR)xscroll.o \ | ||
$(OBJECTDIR)xcursor.o \ | ||
$(OBJECTDIR)xlspwin.o \ | ||
$(OBJECTDIR)xrdopt.o \ | ||
$(OBJECTDIR)xwinman.o | ||
|
||
|
||
XFLAGS = -DXWINDOW | ||
|
||
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it | ||
OPTFLAGS = -O0 -g | ||
DEBUGFLAGS = | ||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__ | ||
|
||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/ldeinit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Options for Windows System for Linux v1, Intel x86_64 processor, X windows, for INIT processing | ||
|
||
CC = gcc $(GCC_CFLAGS) | ||
#CC = clang $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)xmkicon.o \ | ||
$(OBJECTDIR)xbbt.o \ | ||
$(OBJECTDIR)dspif.o \ | ||
$(OBJECTDIR)xinit.o \ | ||
$(OBJECTDIR)xscroll.o \ | ||
$(OBJECTDIR)xcursor.o \ | ||
$(OBJECTDIR)xlspwin.o \ | ||
$(OBJECTDIR)xrdopt.o \ | ||
$(OBJECTDIR)xwinman.o | ||
|
||
|
||
XFLAGS = -DXWINDOW | ||
|
||
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it | ||
OPTFLAGS = -O0 -g | ||
DEBUGFLAGS = | ||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT -D__wsl1__ | ||
|
||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/ldeinit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Options for Windows System for Linux v1, ARM64 and SDL | ||
|
||
CC = gcc $(GCC_CFLAGS) | ||
#CC = clang $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)sdl.o | ||
|
||
# | ||
# For SDL version 2 | ||
# -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS | ||
# For SDL version 3 | ||
# -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS | ||
# | ||
SDLFLAGS = -DSDL=2 | ||
|
||
# OPTFLAGS is normally -O2. | ||
OPTFLAGS = -O2 -g3 | ||
DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__ | ||
|
||
LDFLAGS = -lSDL2 -lm | ||
LDELDFLAGS = | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Options for Windows System for Linux v1, aarch64 and X-Window | ||
|
||
CC = gcc $(GCC_CFLAGS) | ||
#CC = clang $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)xmkicon.o \ | ||
$(OBJECTDIR)xbbt.o \ | ||
$(OBJECTDIR)dspif.o \ | ||
$(OBJECTDIR)xinit.o \ | ||
$(OBJECTDIR)xscroll.o \ | ||
$(OBJECTDIR)xcursor.o \ | ||
$(OBJECTDIR)xlspwin.o \ | ||
$(OBJECTDIR)xrdopt.o \ | ||
$(OBJECTDIR)xwinman.o | ||
|
||
XFLAGS = -DXWINDOW | ||
|
||
# OPTFLAGS is normally -O2. | ||
OPTFLAGS = -O2 -g3 | ||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__ | ||
|
||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Options for Windows System for Linux v1, Intel x86_64 and SDL | ||
|
||
CC = gcc -m64 $(GCC_CFLAGS) | ||
# CC = clang -m64 $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)sdl.o | ||
|
||
# | ||
# For SDL version 2 | ||
# -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS | ||
# For SDL version 3 | ||
# -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS | ||
# | ||
XFLAGS = -DSDL=2 | ||
|
||
# OPTFLAGS is normally -O2. | ||
OPTFLAGS = -O2 -g3 | ||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__ | ||
|
||
LDFLAGS = -lm -lSDL2 | ||
LDELDFLAGS = | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# Options for Windows System for Linux v1, Intel x86_64 and X-Window | ||
|
||
CC = gcc -m64 $(GCC_CFLAGS) | ||
# CC = clang -m64 $(CLANG_CFLAGS) | ||
|
||
XFILES = $(OBJECTDIR)xmkicon.o \ | ||
$(OBJECTDIR)xbbt.o \ | ||
$(OBJECTDIR)dspif.o \ | ||
$(OBJECTDIR)xinit.o \ | ||
$(OBJECTDIR)xscroll.o \ | ||
$(OBJECTDIR)xcursor.o \ | ||
$(OBJECTDIR)xlspwin.o \ | ||
$(OBJECTDIR)xrdopt.o \ | ||
$(OBJECTDIR)xwinman.o | ||
|
||
|
||
XFLAGS = -DXWINDOW | ||
|
||
# OPTFLAGS is normally -O2. | ||
OPTFLAGS = -O2 -g3 | ||
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__ | ||
|
||
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm | ||
|
||
OBJECTDIR = ../$(RELEASENAME)/ | ||
|
||
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.