Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
cf510ad7
Commit
cf510ad7
authored
10 years ago
by
Guenter Knauf
Browse files
Options
Downloads
Patches
Plain Diff
build: in Makefile.m32 moved target autodetection.
Moved target autodetection block after defining CC macro.
parent
140ca2dc
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/Makefile.m32
+10
-10
10 additions, 10 deletions
lib/Makefile.m32
src/Makefile.m32
+10
-10
10 additions, 10 deletions
src/Makefile.m32
with
20 additions
and
20 deletions
lib/Makefile.m32
+
10
−
10
View file @
cf510ad7
...
...
@@ -54,16 +54,6 @@ ifndef LIBCARES_PATH
LIBCARES_PATH
=
$(
PROOT
)
/ares
endif
# Set environment var ARCH to your architecture to override autodetection.
ifndef
ARCH
TARGET
:=
$(
shell
$(
CC
)
-dumpmachine
)
ifeq
($(findstring x86_64,$(TARGET)),x86_64)
ARCH
=
w64
else
ARCH
=
w32
endif
endif
CC
=
$(
CROSSPREFIX
)
gcc
CFLAGS
=
-g
-O2
-Wall
CFLAGS
+=
-fno-strict-aliasing
...
...
@@ -75,6 +65,16 @@ RC = $(CROSSPREFIX)windres
RCFLAGS
=
--include-dir
=
$(
PROOT
)
/include
-DDEBUGBUILD
=
0
-O
COFF
STRIP
=
$(
CROSSPREFIX
)
strip
-g
# Set environment var ARCH to your architecture to override autodetection.
ifndef
ARCH
TARGET
:=
$(
shell
$(
CC
)
-dumpmachine
)
ifeq
($(findstring x86_64,$(TARGET)),x86_64)
ARCH
=
w64
else
ARCH
=
w32
endif
endif
ifeq
($(ARCH),w64)
CFLAGS
+=
-D_AMD64_
RCFLAGS
+=
-F
pe-x86-64
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.m32
+
10
−
10
View file @
cf510ad7
...
...
@@ -66,16 +66,6 @@ ifndef LIBCARES_PATH
LIBCARES_PATH
=
$(
PROOT
)
/ares
endif
# Set environment var ARCH to your architecture to override autodetection.
ifndef
ARCH
TARGET
:=
$(
shell
$(
CC
)
-dumpmachine
)
ifeq
($(findstring x86_64,$(TARGET)),x86_64)
ARCH
=
w64
else
ARCH
=
w32
endif
endif
CC
=
$(
CROSSPREFIX
)
gcc
CFLAGS
=
-g
-O2
-Wall
CFLAGS
+=
-fno-strict-aliasing
...
...
@@ -90,6 +80,16 @@ STRIP = $(CROSSPREFIX)strip -g
# PERL = perl
# NROFF = nroff
# Set environment var ARCH to your architecture to override autodetection.
ifndef
ARCH
TARGET
:=
$(
shell
$(
CC
)
-dumpmachine
)
ifeq
($(findstring x86_64,$(TARGET)),x86_64)
ARCH
=
w64
else
ARCH
=
w32
endif
endif
ifeq
($(ARCH),w64)
CFLAGS
+=
-D_AMD64_
RCFLAGS
+=
-F
pe-x86-64
...
...
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