gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implemented support for xxx_WINDRES_FILES on mingw32

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21472 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-07-14 16:20:07 +00:00
parent 2b66c0e090
commit 03b646e720
3 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,10 +1,22 @@
2005-07-14 Jeremy Bettis <jeremy@deadbeef.com>,
Nicola Pero <n.pero@mi.flashnet.it>
Implemented support for xxx_WINDRES_FILES on mingw32.
* rules.make ($(GNUSTEP_OBJ_DIR)/%${OEXT}): New mingw32 rule to
compile a .rc (windres) file into an object file.
(.SUFFIXES): On mingw32, add .rc.
* Instance/rules.make (WINDRES_OBJS, WINDRES_OBJ_FILES): New
variables for mingw32; generate them from xxx_WINDRES_FILES.
(OBJ_FILES_TO_LINK): Add WINDRES_OBJ_FILES to the list of files to
link.
2005-07-14 Jeremy Bettis <jeremy@deadbeef.com>,
Nicola Pero <n.pero@mi.flashnet.it>
* Instance/framework.make: Implemented pseudo-framework support
for mingw32 (Windows): disable versioning on Windows, switch
to use the new DLL building system already used by libraries,
and clean up all the small details.
Implemented pseudo-framework support for mingw32 (Windows).
* Instance/framework.make: disable versioning on Windows, switch
to use the new DLL building system already used by libraries, and
clean up all the small details of pseudo-frameworks on mingw32.
2005-07-13 Nicola Pero <n.pero@mi.flashnet.it>

12
Instance/rules.make
View file

@ -168,6 +168,9 @@ endif
# The list of JAVA source files from which to generate jni headers
# are in the JAVA_JNI_FILES variable.
#
# This list of WINDRES source files to be compiled
# are in the WINDRES_FILES variable.
#
#
# Please note the subtle difference:
@ -215,6 +218,13 @@ CC_OBJS = $(patsubst %.cc,%$(OEXT),\
$(patsubst %.cxx,%$(OEXT),$($(GNUSTEP_INSTANCE)_CC_FILES))))))
CC_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(CC_OBJS))
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
WINDRES_OBJS = $(patsubst %.rc,%$(OEXT),$($(GNUSTEP_INSTANCE)_WINDRES_FILES))
WINDRES_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(WINDRES_OBJS))
else
WINDRES_OBJ_FILES =
endif
OBJ_FILES = $($(GNUSTEP_INSTANCE)_OBJ_FILES)
# OBJ_FILES_TO_LINK is the set of all .o files which will be linked
@ -224,7 +234,7 @@ OBJ_FILES = $($(GNUSTEP_INSTANCE)_OBJ_FILES)
# OBJ_FILES_TO_LINK to '' we know if there is a link stage to be
# performed at all (useful for example in bundles which can contain an
# object file, or not).
OBJ_FILES_TO_LINK = $(strip $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(CC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES))
OBJ_FILES_TO_LINK = $(strip $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(CC_OBJ_FILES) $(WINDRES_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) $(OBJ_FILES))
ifeq ($(AUTO_DEPENDENCIES),yes)
ifneq ($(strip $(OBJ_FILES_TO_LINK)),)

14
rules.make
View file

@ -480,6 +480,20 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cp
$(YACC) $(YACC_FLAGS) $<
mv -f y.tab.c $@
#
# Special mingw32 specific rules to compile Windows resource files (.rc files)
# into object files.
#
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
# Add the .rc suffix on Windows.
.SUFFIXES: .rc
# A rule to generate a .o file from the .rc file.
$(GNUSTEP_OBJ_DIR)/%${OEXT}: %.rc
$(ECHO_COMPILING)windres $< $@$(END_ECHO)
endif
# The following dummy rules are needed for performance - we need to
# prevent make from spending time trying to compute how/if to rebuild
# the system makefiles! the following rules tell him that these files