Skip to content

Commit

Permalink
Fix building with makefile.win32 from Windows command prompt, not MSYS
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhekov @ntrel
zhekov authored and ntrel committed Jun 26, 2012
1 parent 40da14b commit 08d751d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
26 changes: 12 additions & 14 deletions makefile.win32
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@
WINDRES = windres.exe WINDRES = windres.exe
CC = gcc CC = gcc
CXX = g++ CXX = g++
CP = copy CP = copy /Y
RM = del RM = del
MAKE = make MAKE = mingw32-make
-include localwin32.mk -include localwin32.mk


# Note: && is needed after cd because each line is executed in a different
# shell. (cd .. is just for clarity).
all: config.h all: config.h
cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../.. $(MAKE) -C tagmanager/mio -f makefile.win32
cd tagmanager && $(MAKE) -f makefile.win32 && cd .. $(MAKE) -C tagmanager -f makefile.win32
cd scintilla && $(MAKE) -f makefile.win32 && cd .. $(MAKE) -C scintilla -f makefile.win32
cd plugins && $(MAKE) -f makefile.win32 && cd .. $(MAKE) -C plugins -f makefile.win32
cd src && $(MAKE) -f makefile.win32 && cd .. $(MAKE) -C src -f makefile.win32


config.h: win32-config.h config.h: win32-config.h
$(CP) $< $@ $(CP) $< $@
Expand All @@ -39,11 +37,11 @@ clean-local:
-$(RM) geany_private.res geany.exe -$(RM) geany_private.res geany.exe


clean: deps clean: deps
cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../.. $(MAKE) -C tagmanager/mio -f makefile.win32 clean
cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. $(MAKE) -C tagmanager -f makefile.win32 clean
cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. $(MAKE) -C scintilla -f makefile.win32 clean
cd plugins && $(MAKE) -f makefile.win32 clean && cd .. $(MAKE) -C plugins -f makefile.win32 clean
cd src && $(MAKE) -f makefile.win32 clean && cd .. $(MAKE) -C src -f makefile.win32 clean


.PHONY: install .PHONY: install
DESTDIR='C:/Program Files/Geany' DESTDIR='C:/Program Files/Geany'
Expand Down
10 changes: 5 additions & 5 deletions src/makefile.win32
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -77,18 +77,18 @@ $(RES): ../geany_private.rc ../icons/geany.ico
# this calls parent clean-local target because del ../file won't work # this calls parent clean-local target because del ../file won't work
clean: clean:
-$(RM) deps.mak *.o -$(RM) deps.mak *.o
cd .. && $(MAKE) -f makefile.win32 clean-local && cd src $(MAKE) -C .. -f makefile.win32 clean-local


exec: exec:
$(EXECDIR)\geany.exe $(EXECDIR)\geany.exe


binclean: binclean:
$(RM) $(TARGET) $(RM) $(TARGET)


$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a STLIBS = ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a
$(CXX) $(OBJS) $(RES) -o $(TARGET) \
../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \ $(TARGET): $(OBJS) $(RES) $(STLIBS)
$(ALL_GTK_LIBS) $(WIN_LIBS) $(CXX) $(OBJS) $(RES) -o $(TARGET) $(STLIBS) $(ALL_GTK_LIBS) $(WIN_LIBS)


deps.mak: deps.mak:
$(CC) -MM $(CFLAGS) *.c >deps.mak $(CC) -MM $(CFLAGS) *.c >deps.mak
Expand Down

0 comments on commit 08d751d

Please sign in to comment.