1 --- allegro/makefile.mgw.orig Sun Dec 15 15:35:38 2002
2 +++ allegro/makefile.mgw Sun Dec 15 19:37:44 2002
4 # -------- define some variables that the primary makefile will use --------
10 RUNNER = obj/mingw32/runner.exe
19 -$(MINGDIR_U)/lib/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
21 + mkdir $(MINGDIR_U)/lib
23 +$(MINGDIR_U)/lib/$(DLL_BASENAME): $(MINGDIR_U)/lib
24 + cp lib/mingw32/$(DLL_BASENAME) $(MINGDIR_U)/lib
26 +$(MINGDIR_U)/lib/$(IMPLIB_BASENAME): $(IMPLIB_NAME) $(MINGDIR_U)/lib
27 cp lib/mingw32/$(IMPLIB_BASENAME) $(MINGDIR_U)/lib
32 INSTALL_FILES += $(WINDIR_U)/$(DLL_BASENAME)
35 + INSTALL_FILES += $(MINGDIR_U)/lib/$(DLL_BASENAME)
38 install: $(INSTALL_FILES)
43 - DLLWRAP = i386-mingw32msvc-dllwrap
44 - WINDRES = i386-mingw32msvc-windres
45 + DLLWRAP = i386-mingw32-dllwrap
46 + WINDRES = i386-mingw32-windres
51 COMPILE_FLAGS += $(subst src/,-DALLEGRO_SRC ,$(findstring src/, $<))$(CFLAGS)
54 - gcc $(COMPILE_FLAGS) -I. -I./include -o $@ -c $<
55 + $(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $<
58 - gcc $(SFLAGS) -I. -I./include -x assembler-with-cpp -o $@ -c $<
59 + $(CC) $(SFLAGS) -I. -I./include -x assembler-with-cpp -o $@ -c $<
62 $(WINDRES) --include-dir include -O coff -o $@ -i $<
64 $(WINDRES) -O coff -o $@ -i $<
66 tests/win/dibsound.exe: $(OBJ_DIR)/dibsound.o obj/mingw32/dibsound.res $(IMPLIB_NAME)
67 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/dibsound.exe $(OBJ_DIR)/dibsound.o obj/mingw32/dibsound.res $(IMPLIB_NAME) $(LIBRARIES)
68 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/dibsound.exe $(OBJ_DIR)/dibsound.o obj/mingw32/dibsound.res $(IMPLIB_NAME) $(LIBRARIES)
70 tests/win/dxwindow.exe: $(OBJ_DIR)/dxwindow.o obj/mingw32/dxwindow.res $(IMPLIB_NAME)
71 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/dxwindow.exe $(OBJ_DIR)/dxwindow.o obj/mingw32/dxwindow.res $(IMPLIB_NAME) $(LIBRARIES)
72 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/dxwindow.exe $(OBJ_DIR)/dxwindow.o obj/mingw32/dxwindow.res $(IMPLIB_NAME) $(LIBRARIES)
74 tests/win/%.exe: $(OBJ_DIR)/%.o $(IMPLIB_NAME)
75 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
76 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
78 tests/win/scrsave.scr: $(OBJ_DIR)/scrsave.o obj/mingw32/scrsave.res $(IMPLIB_NAME)
79 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/scrsave.scr $(OBJ_DIR)/scrsave.o obj/mingw32/scrsave.res $(IMPLIB_NAME) $(LIBRARIES)
80 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o tests/win/scrsave.scr $(OBJ_DIR)/scrsave.o obj/mingw32/scrsave.res $(IMPLIB_NAME) $(LIBRARIES)
82 tools/win/%.exe: $(OBJ_DIR)/%.o $(IMPLIB_NAME)
83 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
84 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
93 +demo/demo.exe: $(IMPLIB_NAME)
94 + $(CC) $(COMPILE_FLAGS) -I. -I./include -o $(OBJ_DIR)/demo.o -c ./demo/demo.c
95 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o demo/demo.exe $(OBJ_DIR)/demo.o $(IMPLIB_NAME) $(LIBRARIES)
97 demo/demo.exe: $(OBJ_DIR)/demo.o obj/mingw32/demo.res $(IMPLIB_NAME)
98 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o demo/demo.exe $(OBJ_DIR)/demo.o obj/mingw32/demo.res $(IMPLIB_NAME) $(LIBRARIES)
99 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o demo/demo.exe $(OBJ_DIR)/demo.o obj/mingw32/demo.res $(IMPLIB_NAME) $(LIBRARIES)
102 obj/mingw32/setupdat.s: setup/setup.dat tools/dat2s.exe
104 @@ -505,49 +523,52 @@
107 obj/mingw32/setupdat.o: obj/mingw32/setupdat.s
108 - gcc -o obj/mingw32/setupdat.o -c obj/mingw32/setupdat.s
109 + $(CC) -o obj/mingw32/setupdat.o -c obj/mingw32/setupdat.s
111 $(OBJ_DIR)/setup.o: setup/setup.c
112 - gcc $(COMPILE_FLAGS) -DSETUP_USE_COMPILED_DATAFILES -I. -I./include -o $(OBJ_DIR)/setup.o -c setup/setup.c
113 + $(CC) $(COMPILE_FLAGS) -DSETUP_USE_COMPILED_DATAFILES -I. -I./include -o $(OBJ_DIR)/setup.o -c setup/setup.c
115 setup/setup.exe: $(OBJ_DIR)/setup.o obj/mingw32/setupdat.o $(IMPLIB_NAME)
116 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o setup/setup.exe $(OBJ_DIR)/setup.o obj/mingw32/setupdat.o $(IMPLIB_NAME) $(LIBRARIES)
117 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o setup/setup.exe $(OBJ_DIR)/setup.o obj/mingw32/setupdat.o $(IMPLIB_NAME) $(LIBRARIES)
121 */%.exe: $(OBJ_DIR)/%.o $(IMPLIB_NAME)
122 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
123 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,windows -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
125 LINK_CONSOLE_DEPS = $(IMPLIB_NAME)
128 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
129 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $< $(IMPLIB_NAME) $(LIBRARIES)
134 obj/mingw32/asmdef.s: src/i386/asmdef.c include/*.h include/allegro/*.h obj/mingw32/asmcapa.h
135 - gcc $(WFLAGS) -I. -I./include -S -o obj/mingw32/asmdef.s src/i386/asmdef.c
136 + $(CC) $(WFLAGS) -I. -I./include -S -o obj/mingw32/asmdef.s src/i386/asmdef.c
138 obj/mingw32/asmdef.inc: obj/mingw32/asmdef.s
139 if [ ! -x misc/asmdef.sh ]; then chmod a+x misc/asmdef.sh; fi
140 misc/asmdef.sh obj/mingw32/asmdef.s obj/mingw32/asmdef.inc
147 obj/mingw32/asmdef.inc: obj/mingw32/asmdef.exe
148 obj/mingw32/asmdef.exe obj/mingw32/asmdef.inc
150 obj/mingw32/asmdef.exe: src/i386/asmdef.c
151 - gcc -O $(WFLAGS) $(PFLAGS) -I. -I./include -o obj/mingw32/asmdef.exe src/i386/asmdef.c
152 + $(CC) -O $(WFLAGS) $(PFLAGS) -I. -I./include -o obj/mingw32/asmdef.exe src/i386/asmdef.c
154 -obj/mingw32/runner.exe: src/misc/runnergw.c
155 - gcc -O -Wall -Werror -o obj/mingw32/runner.exe src/misc/runnergw.c
156 +$(RUNNER): src/misc/runnergw.c
157 + $(CC) -O -Wall -Werror -o obj/mingw32/runner.exe src/misc/runnergw.c
161 define LINK_WITHOUT_LIB
162 - gcc $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $^
163 + $(CC) $(LFLAGS) $(PFLAGS) -Wl,--subsystem,console -o $@ $^
166 PLUGIN_LIB = lib/mingw32/lib$(VERY_SHORT_VERSION)dat.a
167 @@ -584,10 +605,10 @@
168 DEPEND_PARAMS = -MM -MG -I. -I./include -DSCAN_DEPEND -DALLEGRO_MINGW32
171 - gcc $(DEPEND_PARAMS) src/*.c src/c/*.c src/i386/*.c src/misc/*.c src/win/*.c demo/*.c > _depend.tmp
172 - gcc $(DEPEND_PARAMS) docs/src/makedoc/*.c examples/*.c setup/*.c tests/*.c tests/win/*.c >> _depend.tmp
173 - gcc $(DEPEND_PARAMS) tools/*.c tools/win/*.c tools/plugins/*.c >> _depend.tmp
174 - gcc $(DEPEND_PARAMS) -x assembler-with-cpp src/c/*.s src/i386/*.s src/misc/*.s src/win/*.s >> _depend.tmp
175 + $(CC) $(DEPEND_PARAMS) src/*.c src/c/*.c src/i386/*.c src/misc/*.c src/win/*.c demo/*.c > _depend.tmp
176 + $(CC) $(DEPEND_PARAMS) docs/src/makedoc/*.c examples/*.c setup/*.c tests/*.c tests/win/*.c >> _depend.tmp
177 + $(CC) $(DEPEND_PARAMS) tools/*.c tools/win/*.c tools/plugins/*.c >> _depend.tmp
178 + $(CC) $(DEPEND_PARAMS) -x assembler-with-cpp src/c/*.s src/i386/*.s src/misc/*.s src/win/*.s >> _depend.tmp
179 sed -e "s/^[a-zA-Z0-9_\/]*\///" _depend.tmp > _depend2.tmp
181 sed -e "s/^\([a-zA-Z0-9_]*\)\.o:/obj\/mingw32\/alleg\/\1\.o:/" _depend2.tmp > obj/mingw32/alleg/makefile.dep