Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
graphicsframework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Oliver Behnke
graphicsframework
Commits
524746d1
Commit
524746d1
authored
15 years ago
by
Oliver Bock
Browse files
Options
Downloads
Patches
Plain Diff
Added GCC 4.4 support for MinGW build (using Debian Squeeze as host)
parent
8ad2fe81
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.sh
+15
-2
15 additions, 2 deletions
build.sh
src/framework/Makefile.mingw
+2
-0
2 additions, 0 deletions
src/framework/Makefile.mingw
src/starsphere/Makefile.mingw
+2
-1
2 additions, 1 deletion
src/starsphere/Makefile.mingw
with
19 additions
and
3 deletions
build.sh
+
15
−
2
View file @
524746d1
...
...
@@ -503,7 +503,7 @@ set_mingw()
{
# general config
PREFIX
=
$ROOT
/install
TARGET_HOST
=
i586-mingw32msvc
export
TARGET_HOST
=
i586-mingw32msvc
BUILD_HOST
=
i386-linux
PATH_MINGW
=
"
$PREFIX
/bin:
$PREFIX
/
$TARGET_HOST
/bin:
$PATH
"
PATH
=
"
$PATH_MINGW
"
...
...
@@ -690,7 +690,7 @@ build_boinc_mingw()
cp
$ROOT
/3rdparty/boinc/lib/parse.h
$ROOT
/install/include/boinc
>>
$LOGFILE
2>&1
||
failure
cp
$ROOT
/3rdparty/boinc/lib/util.h
$ROOT
/install/include/boinc
>>
$LOGFILE
2>&1
||
failure
# invoke MinGW's (Debian Squeeze) ranlib as the archive lacks an index
/usr/i586-mingw32msvc/bin/
ranlib
$ROOT
/install/lib/libboinc.a
${
TARGET_HOST
}
-
ranlib
$ROOT
/install/lib/libboinc.a
echo
"Successfully built and installed BOINC!"
|
tee
-a
$LOGFILE
store_build_state
$BS_BUILD_BOINC_MINGW
||
failure
...
...
@@ -714,7 +714,20 @@ build_starsphere()
export
ORC_INSTALL
=
$ROOT
/install
||
failure
cd
$ROOT
/build/orc
||
failure
cp
$ROOT
/src/orc/Makefile
.
>>
$LOGFILE
2>&1
||
failure
if
[
"
$1
"
==
"
$TARGET_WIN32
"
]
;
then
# backup MinGW compiler settings
CC_MINGW
=
$CC
CXX_MINGW
=
$CXX
# set the native compilers (ORC will be run on host, not on target)
export
CC
=
`
which gcc
`
export
CXX
=
`
which g++
`
fi
make
$2
>>
$LOGFILE
2>&1
||
failure
if
[
"
$1
"
==
"
$TARGET_WIN32
"
]
;
then
# restore MinGW compiler settings
export
CC
=
$CC_MINGW
export
CXX
=
$CXX_MINGW
fi
make
install
>>
$LOGFILE
2>&1
||
failure
echo
"Successfully built and installed Starsphere [ORC]!"
|
tee
-a
$LOGFILE
...
...
This diff is collapsed.
Click to expand it.
src/framework/Makefile.mingw
+
2
−
0
View file @
524746d1
...
...
@@ -24,6 +24,7 @@ FRAMEWORK_INSTALL?=$(PWD)
# config values
CXX
?=
g++
TARGET_HOST
?=
i586-pc-mingw32
# variables
CPPFLAGS
+=
$(
shell
$(
FRAMEWORK_INSTALL
)
/bin/sdl-config
--cflags
)
...
...
@@ -52,6 +53,7 @@ release: CPPFLAGS += -DNDEBUG -gstabs3 -O3 -Wall -Wno-switch-enum
# file based targets
libframework.a
:
$(OBJS)
ar rcs libframework.a
$(
OBJS
)
$(
TARGET_HOST
)
-ranlib
libframework.a
AbstractGraphicsEngine.o
:
$(DEPS) $(FRAMEWORK_SRC)/AbstractGraphicsEngine.cpp $(FRAMEWORK_SRC)/AbstractGraphicsEngine.h
$(
CXX
)
-g
${
CPPFLAGS
}
-c
$(
FRAMEWORK_SRC
)
/AbstractGraphicsEngine.cpp
...
...
This diff is collapsed.
Click to expand it.
src/starsphere/Makefile.mingw
+
2
−
1
View file @
524746d1
...
...
@@ -24,6 +24,7 @@ STARSPHERE_INSTALL?=$(PWD)
# config values
CXX
?=
g++
TARGET_HOST
?=
i586-pc-mingw32
# variables
LIBS
+=
-Wl
,-Bstatic
...
...
@@ -106,7 +107,7 @@ $(RESOURCESPEC).o: $(STARSPHERE_SRC)/$(RESOURCESPEC).orc
$(RESOURCESPEC)_mingw.o
:
$(STARSPHERE_SRC)/$(RESOURCESPEC).rc
cp
$(
STARSPHERE_SRC
)
/
*
.ico .
$(
S
TAR
SPHERE_INSTALL
)
/bin/i586-pc-mingw32
-windres
-O
coff
-o
$(
RESOURCESPEC
)
_mingw.o
$(
STARSPHERE_SRC
)
/
$(
RESOURCESPEC
)
.rc
$(
TAR
GET_HOST
)
-windres
-O
coff
-o
$(
RESOURCESPEC
)
_mingw.o
$(
STARSPHERE_SRC
)
/
$(
RESOURCESPEC
)
.rc
# tools
install
:
...
...
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