From 42ceda94dab9f6e95396bb8f41185d0831fabae3 Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Mon, 13 Oct 2008 17:22:33 +0200 Subject: [PATCH] Added application icon to win32 build --- src/starsphere/EaH.ico | Bin 0 -> 23998 bytes src/starsphere/Makefile.mingw | 9 ++++++--- src/starsphere/resources.rc | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 src/starsphere/EaH.ico create mode 100644 src/starsphere/resources.rc diff --git a/src/starsphere/EaH.ico b/src/starsphere/EaH.ico new file mode 100644 index 0000000000000000000000000000000000000000..11485cad3e66b1218584c93db7619d50a5b7b065 GIT binary patch literal 23998 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 a02{6jWm)Z+&$3#l4kuntNr?nnw*vqfpRQd1 literal 0 HcmV?d00001 diff --git a/src/starsphere/Makefile.mingw b/src/starsphere/Makefile.mingw index 563b2b3..b98624f 100644 --- a/src/starsphere/Makefile.mingw +++ b/src/starsphere/Makefile.mingw @@ -45,7 +45,7 @@ CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += -I$(STARSPHERE_INSTALL)/include/BOINC DEPS = Makefile -OBJS = Starsphere.o StarsphereS5R3.o StarsphereRadio.o EinsteinS5R3Adapter.o EinsteinRadioAdapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o +OBJS = Starsphere.o StarsphereS5R3.o StarsphereRadio.o EinsteinS5R3Adapter.o EinsteinRadioAdapter.o starlist.o snr_list.o pulsar_list.o $(RESOURCESPEC).o $(RESOURCESPEC)_mingw.o RESOURCESPEC = resources # TODO: GraphicsEngineFactory obviously depends on the actual implementations (here starsphere)! need to change the structure! what about plugins? @@ -70,10 +70,10 @@ callgrind: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND # file based targets starsphere_EinsteinS5R3: $(DEPS) $(STARSPHERE_SRC)/main.cpp $(OBJS) - $(CXX) -g $(CPPFLAGS) $(LDFLAGS) $(STARSPHERE_SRC)/main.cpp -o starsphere_EinsteinS5R3 $(OBJS) $(LIBS) + $(CXX) -g $(CPPFLAGS) $(LDFLAGS) $(STARSPHERE_SRC)/main.cpp -o starsphere_EinsteinS5R3.exe $(OBJS) $(LIBS) starsphere_EinsteinRadio: $(DEPS) $(STARSPHERE_SRC)/main.cpp $(OBJS) - $(CXX) -g $(CPPFLAGS) $(LDFLAGS) $(STARSPHERE_SRC)/main.cpp -o starsphere_EinsteinRadio $(OBJS) $(LIBS) + $(CXX) -g $(CPPFLAGS) $(LDFLAGS) $(STARSPHERE_SRC)/main.cpp -o starsphere_EinsteinRadio.exe $(OBJS) $(LIBS) Starsphere.o: $(DEPS) $(STARSPHERE_SRC)/Starsphere.cpp $(STARSPHERE_SRC)/Starsphere.h $(CXX) -g $(CPPFLAGS) -c $(STARSPHERE_SRC)/Starsphere.cpp @@ -104,6 +104,9 @@ $(RESOURCESPEC).o: $(STARSPHERE_SRC)/$(RESOURCESPEC).orc $(STARSPHERE_INSTALL)/bin/orc $(STARSPHERE_SRC)/$(RESOURCESPEC).orc $(RESOURCESPEC).cpp $(CXX) -g $(CPPFLAGS) -c $(RESOURCESPEC).cpp -o $(RESOURCESPEC).o +$(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 # tools memcheck: diff --git a/src/starsphere/resources.rc b/src/starsphere/resources.rc new file mode 100644 index 0000000..f730d2d --- /dev/null +++ b/src/starsphere/resources.rc @@ -0,0 +1,2 @@ +#define IDI_ICON1 101 +IDI_ICON1 ICON DISCARDABLE "EaH.ico" -- GitLab