Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
  • mingw_gcc44
  • pre_release_0.08
  • pre_release_0.09
  • pre_release_0.10
  • pre_release_0.11
  • pre_release_0.12
  • pre_release_0.13
  • pre_release_0.14
  • pre_release_0.15
  • release_ABP1_001
  • release_ABP1_002
  • release_ABP1_003
  • release_ABP1_004
  • release_ABP1_005
  • release_ABP1_006
  • release_ABP1_007
  • release_ABP1_008
  • release_ABP1_012
19 results

Target

Select target project
  • einsteinathome/graphicsframework
  • brevilo/graphicsframework
2 results
Select Git revision
  • master
  • pre_release_0.08
  • pre_release_0.09
  • pre_release_0.10
  • pre_release_0.11
  • pre_release_0.12
  • pre_release_0.13
  • pre_release_0.14
  • pre_release_0.15
  • release_ABP1_001
  • release_ABP1_002
  • release_ABP1_003
  • release_ABP1_004
  • release_ABP1_005
  • release_ABP1_006
  • release_ABP1_007
  • release_ABP1_008
  • release_ABP1_012
18 results
Show changes

Commits on Source 9

......@@ -464,7 +464,7 @@ build_boinc()
chmod +x configure >> $LOGFILE 2>&1 || failure
cd $ROOT/build/boinc || failure
if [ "$1" == "$TARGET_MAC" ]; then
export CPPFLAGS=-I/sw/include
export CPPFLAGS=-I/sw/include -I/opt/local/include $CPPFLAGS
$ROOT/3rdparty/boinc/configure --prefix=$ROOT/install --enable-shared=no --enable-static=yes --disable-server --disable-client --with-apple-opengl-framework --enable-install-headers --enable-libraries --disable-manager --disable-fcgi >> $LOGFILE 2>&1 || failure
elif [ -d "/usr/local/ssl" ]; then
echo "Using local SSL library..." | tee -a $LOGFILE
......@@ -503,11 +503,18 @@ set_mingw()
{
# general config
PREFIX=$ROOT/install
TARGET_HOST=i586-pc-mingw32
# the following target host spec is Debian specific!
# use "i586-pc-mingw32" when building MinGW automatically
export TARGET_HOST=i586-mingw32msvc
BUILD_HOST=i386-linux
PATH_MINGW="$PREFIX/bin:$PREFIX/$TARGET_HOST/bin:$PATH"
PATH="$PATH_MINGW"
export PATH
export CC=`which ${TARGET_HOST}-gcc`
export CXX=`which ${TARGET_HOST}-g++`
export CPPFLAGS="-D_WIN32_WINDOWS=0x0410 -DMINGW_WIN32 $CPPFLAGS"
}
......@@ -643,47 +650,10 @@ build_boinc_mingw()
prepare_boinc $TAG_GFXAPPS || failure
echo "Patching BOINC..." | tee -a $LOGFILE
cd $ROOT/3rdparty/boinc/lib || failure
# patch: fix a couple of BOINC vs. MinGW issues
patch boinc_win.h < $ROOT/patches/boinc.boinc_win.h.minggw.patch >> $LOGFILE 2>&1 || failure
patch filesys.cpp < $ROOT/patches/boinc.filesys.cpp.mingw.patch >> $LOGFILE 2>&1 || failure
echo "Building BOINC (this may take a while)..." | tee -a $LOGFILE
cd $ROOT/3rdparty/boinc || failure
chmod +x _autosetup >> $LOGFILE 2>&1 || failure
./_autosetup >> $LOGFILE 2>&1 || failure
chmod +x configure >> $LOGFILE 2>&1 || failure
cd $ROOT/build/boinc || failure
# note: configure is still required but we don't use the generated Makefile
$ROOT/3rdparty/boinc/configure --host=$TARGET_HOST --build=$BUILD_HOST --prefix=$ROOT/install --includedir=$ROOT/install/include --oldincludedir=$ROOT/install/include --enable-shared=no --enable-static=yes --disable-server --disable-client --enable-install-headers --enable-libraries --disable-manager --disable-fcgi >> $LOGFILE 2>&1 || failure
cd $ROOT/build/boinc/api || failure
cp $ROOT/3rdparty/boinc/api/Makefile.mingw . >> $LOGFILE 2>&1 || failure
# patch: add graphics2 and customize build path (see below)
patch Makefile.mingw < $ROOT/patches/boinc.Makefile.mingw.patch >> $LOGFILE 2>&1 || failure
export BOINC_SRC=$ROOT/3rdparty/boinc || failure
cd $ROOT/build/boinc || failure
# required for out-of-tree build
cp config.h $ROOT/3rdparty/boinc >> $LOGFILE 2>&1 || failure
make -f api/Makefile.mingw >> $LOGFILE 2>&1 || failure
cp $ROOT/build/boinc/libboinc.a $ROOT/install/lib >> $LOGFILE 2>&1 || failure
mkdir -p $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/build/boinc/config.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/build/boinc/version.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/api/boinc_api.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/api/graphics2.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/app_ipc.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/boinc_win.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/common_defs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/diagnostics.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/diagnostics_win.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/filesys.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/hostinfo.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/proxy_info.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/prefs.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/miofile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
cp $ROOT/3rdparty/boinc/lib/mfile.h $ROOT/install/include/boinc >> $LOGFILE 2>&1 || failure
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
BOINC_SRC="$ROOT/3rdparty/boinc" AR="${TARGET_HOST}-ar" make -f Makefile.mingw >> $LOGFILE 2>&1 || failure
BOINC_PREFIX="$ROOT/install" RANLIB="${TARGET_HOST}-ranlib" make -f Makefile.mingw install >> $LOGFILE 2>&1 || failure
echo "Successfully built and installed BOINC!" | tee -a $LOGFILE
store_build_state $BS_BUILD_BOINC_MINGW || failure
......@@ -707,7 +677,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
......@@ -780,11 +763,10 @@ build_mac()
build_win32()
{
export CPPFLAGS="-D_WIN32_WINDOWS=0x0410 $CPPFLAGS"
prepare_mingw || failure
build_mingw || failure
# no more prepare/build steps for MinGW
# we use Debian's MinGW with GCC 4.4 support
set_mingw || failure
build_sdl_mingw || failure
build_freetype_mingw || failure
build_libxml_mingw || failure
......
--- Makefile.mingw
+++ Makefile.mingw 2009-07-07 15:03:03.000000000 +0200
@@ -1,14 +1,14 @@
-BOINCDIR = ./boinc
+BOINCDIR = $(BOINC_SRC)
DEBUG = -D__DEBUG__ -g3
-OBJ = boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o
+OBJ = graphics2.o graphics2_util.o boinc_api.o util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o parse.o prefs.o proxy_info.o str_util.o shmem.o stackwalker_win.o base64.o
LINKOBJ = $(OBJ)
LDFLAGS = -lwinmm -march=i386
INCS = -I"$(BOINCDIR)" -I"$(BOINCDIR)/db" -I"$(BOINCDIR)" -I"$(BOINCDIR)/lib" -I"$(BOINCDIR)/api"
CXXINCS = $(INCS)
BIN = libboinc.a
#
-CXXFLAGS = $(CXXINCS) $(DEBUG) --include $(BOINCDIR)/version.h -DWIN32 -D_WIN32 -D_WIN32_WINDOWS=0x0501 -D_MT -DNDEBUG -D_WINDOWS -DBOINC -DCLIENT -DNODB -D_CONSOLE -Wall -mtune=pentium-m -fexceptions -march=i386 -O1
-CFLAGS = $(INCS) $(DEBUG) --include $(BOINCDIR)/version.h -DWIN32 -D_WIN32 -D_WIN32_WINDOWS=0x0501 -D_MT -DNDEBUG -D_WINDOWS -DBOINC -DCLIENT -DNODB -D_CONSOLE -Wall -mtune=pentium-m -fexceptions -march=i386 -O1
+CXXFLAGS = $(CXXINCS) $(DEBUG) --include $(BOINCDIR)/version.h -DWIN32 -D_WIN32 -D_WIN32_WINDOWS=0x0410 -D_MT -DNDEBUG -D_WINDOWS -DBOINC -DCLIENT -DNODB -D_CONSOLE -Wall -mtune=pentium-m -fexceptions -march=i386 -O1
+CFLAGS = $(INCS) $(DEBUG) --include $(BOINCDIR)/version.h -DWIN32 -D_WIN32 -D_WIN32_WINDOWS=0x0410 -D_MT -DNDEBUG -D_WINDOWS -DBOINC -DCLIENT -DNODB -D_CONSOLE -Wall -mtune=pentium-m -fexceptions -march=i386 -O1
.PHONY: all all-before all-after clean clean-custom
--- boinc_win.h
+++ boinc_win.h 2008-06-03 17:35:38.000000000 +0200
@@ -108,7 +108,7 @@
#include <commctrl.h>
#include <raserror.h>
-#include <dbghelp.h>
+#include <imagehlp.h>
#include <tlhelp32.h>
#include <io.h>
@@ -141,7 +141,7 @@
// C headers
#include <sys/stat.h>
#include <sys/types.h>
-#include <fcntl.h>
+// #include <fcntl.h>
#include <malloc.h>
#if !defined(__MINGW32__) && !defined(__CYGWIN32__)
@@ -236,9 +236,9 @@
#endif
void __cdecl _fpreset (void);
void __cdecl fpreset (void);
-#define SetClassLongPtr SetClassLong
-#define GCLP_HICON GCL_HICON
-#define GCLP_HICONSM GCL_HICONSM
+// #define SetClassLongPtr SetClassLong
+// #define GCLP_HICON GCL_HICON
+// #define GCLP_HICONSM GCL_HICONSM
#ifdef __cplusplus
}
#endif
--- filesys.cpp
+++ 3rdparty/boinc/lib/filesys.cpp 2009-03-28 18:30:26.000000000 +0100
@@ -19,7 +19,7 @@
#include "boinc_win.h"
#endif
-#if !defined(_WIN32) || defined(__CYGWIN32__)
+#if !defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__)
#include "config.h"
#ifdef _USING_FCGI_
#include "boinc_fcgi.h"
......@@ -2,8 +2,8 @@
SET(CMAKE_SYSTEM_NAME Windows)
# which compilers to use for C and C++
SET(CMAKE_C_COMPILER i586-pc-mingw32-gcc)
SET(CMAKE_CXX_COMPILER i586-pc-mingw32-g++)
SET(CMAKE_C_COMPILER ${CC})
SET(CMAKE_CXX_COMPILER ${CXX})
# here is the target environment located
SET(CMAKE_FIND_ROOT_PATH ${OGLFT_INSTALL})
......
......@@ -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
......
......@@ -24,6 +24,7 @@ STARSPHERE_INSTALL?=$(PWD)
# config values
CXX ?= g++
TARGET_HOST ?= i586-pc-mingw32
# variables
LIBS += -Wl,-Bstatic
......@@ -31,7 +32,7 @@ LIBS += -lframework -loglft -L$(STARSPHERE_INSTALL)/lib
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs)
LIBS += -lws2_32 # required by libxml2
LIBS += -lboinc
LIBS += -lboinc_graphics2 -lboinc_api -lboinc
LIBS += -Wl,-Bdynamic
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
LIBS += -lopengl32 -lglu32
......@@ -106,7 +107,7 @@ $(RESOURCESPEC).o: $(STARSPHERE_SRC)/$(RESOURCESPEC).orc
$(RESOURCESPEC)_mingw.o: $(STARSPHERE_SRC)/$(RESOURCESPEC).rc
cp $(STARSPHERE_SRC)/*.ico .
$(STARSPHERE_INSTALL)/bin/i586-pc-mingw32-windres -O coff -o $(RESOURCESPEC)_mingw.o $(STARSPHERE_SRC)/$(RESOURCESPEC).rc
$(TARGET_HOST)-windres -O coff -o $(RESOURCESPEC)_mingw.o $(STARSPHERE_SRC)/$(RESOURCESPEC).rc
# tools
install:
......