Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
7f7c7aa7
Commit
7f7c7aa7
authored
Apr 20, 2014
by
Paul Sokolovsky
Browse files
Options
Downloads
Patches
Plain Diff
windows: Unbreak mingw32 build (cross-compiling under Linux).
parent
a196d08d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
windows/Makefile
+15
-8
15 additions, 8 deletions
windows/Makefile
windows/mpconfigport.h
+2
-2
2 additions, 2 deletions
windows/mpconfigport.h
windows/mpconfigport.mk
+13
-0
13 additions, 0 deletions
windows/mpconfigport.mk
with
30 additions
and
10 deletions
windows/Makefile
+
15
−
8
View file @
7f7c7aa7
include
../py/mkenv.mk
include
../py/mkenv.mk
-include
mpconfigport.mk
# define main target
# define main target
PROG
=
micropython.exe
PROG
=
micropython.exe
...
@@ -14,14 +15,15 @@ INC += -I$(PY_SRC)
...
@@ -14,14 +15,15 @@ INC += -I$(PY_SRC)
INC
+=
-I
$(
BUILD
)
INC
+=
-I
$(
BUILD
)
# compiler settings
# compiler settings
CFLAGS
=
$(
INC
)
-Wall
-Werror
-ansi
-std
=
gnu99
-DUNIX
CFLAGS
=
$(
INC
)
-Wall
-Werror
-ansi
-std
=
gnu99
-DUNIX
$(
CFLAGS_MOD
)
$(
COPT
)
LDFLAGS
=
-lm
LDFLAGS
=
$(
LDFLAGS_MOD
)
-lm
# Debugging/Optimization
# Debugging/Optimization
ifdef
DEBUG
ifdef
DEBUG
CFLAGS
+=
-O0
-g
CFLAGS
+=
-g
COPT
=
-O0
else
else
C
FLAGS
+
=
-Os
#-DNDEBUG
C
OPT
=
-Os
#-DNDEBUG
endif
endif
# source files
# source files
...
@@ -30,11 +32,16 @@ SRC_C = \
...
@@ -30,11 +32,16 @@ SRC_C = \
unix/file.c
\
unix/file.c
\
OBJ
=
$(
PY_O
)
$(
addprefix
$(
BUILD
)
/,
$(
SRC_C:.c
=
.o
))
OBJ
=
$(
PY_O
)
$(
addprefix
$(
BUILD
)
/,
$(
SRC_C:.c
=
.o
))
LIB
=
-lreadline
LIB
+=
-lws2_32
ifeq
($(MICROPY_USE_READLINE),1)
LIB
+=
-lmman
CFLAGS_MOD
+=
-DMICROPY_USE_READLINE
=
1
LDFLAGS_MOD
+=
-lreadline
# the following is needed for BSD
# the following is needed for BSD
#LIB += -ltermcap
#LDFLAGS_MOD += -ltermcap
endif
LIB
+=
-lws2_32
#LIB += -lmman
include
../py/mkrules.mk
include
../py/mkrules.mk
This diff is collapsed.
Click to expand it.
windows/mpconfigport.h
+
2
−
2
View file @
7f7c7aa7
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
// Linking with GNU readline causes binary to be licensed under GPL
// Linking with GNU readline causes binary to be licensed under GPL
#ifndef MICROPY_USE_READLINE
#ifndef MICROPY_USE_READLINE
#define MICROPY_USE_READLINE (
1
)
#define MICROPY_USE_READLINE (
0
)
#endif
#endif
#define MICROPY_EMIT_X64 (
1
)
#define MICROPY_EMIT_X64 (
0
)
#define MICROPY_EMIT_THUMB (0)
#define MICROPY_EMIT_THUMB (0)
#define MICROPY_EMIT_INLINE_THUMB (0)
#define MICROPY_EMIT_INLINE_THUMB (0)
#define MICROPY_MEM_STATS (1)
#define MICROPY_MEM_STATS (1)
...
...
This diff is collapsed.
Click to expand it.
windows/mpconfigport.mk
0 → 100644
+
13
−
0
View file @
7f7c7aa7
# Enable/disable modules and 3rd-party libs to be included in interpreter
# Build 32-bit binaries on a 64-bit host
MICROPY_FORCE_32BIT
=
0
# Linking with GNU readline causes binary to be licensed under GPL
MICROPY_USE_READLINE
=
0
# Subset of CPython time module
MICROPY_MOD_TIME
=
1
# ffi module requires libffi (libffi-dev Debian package)
MICROPY_MOD_FFI
=
0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment