diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-11-06 15:04:24 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-11-06 15:04:24 -0800 |
| commit | 3b025442ab07f1bd4e95bf5e0c467b19726d0dfd (patch) | |
| tree | 5aac9878d7283e013bc0ec019d56f2a8293138ba /Makefile.mingw32 | |
| parent | 2f55d6e1c9c9d7179149f745d80b4cdd180b7249 (diff) | |
| parent | a6ad7a6bdf6ca49ec211ee3c429c4f58b59e4f3c (diff) | |
Merge branch 'master' of ssh+git://git.grumpycoder.net/pub/repo.git/lua-interface
Diffstat (limited to 'Makefile.mingw32')
| -rw-r--r-- | Makefile.mingw32 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index e910231..1827667 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -4,12 +4,14 @@ CC = i386-mingw32-gcc CXX = i386-mingw32-g++ LD = i386-mingw32-g++ STRIP = i386-mingw32-strip --strip-unneeded +WINDRES = i386-mingw32-windres else ifeq ($(SYSTEM),MINGW32_NT-5.1) CC = gcc CXX = g++ LD = g++ -STRIP = strip +STRIP = strip --strip-unneeded +WINDRES = windres else DISTRIB=$(shell cat /etc/issue | cut -f 1 -d\ | head -1) ifeq ($(DISTRIB), CentOS) @@ -17,11 +19,13 @@ CC = i686-pc-mingw32-gcc CXX = i686-pc-mingw32-g++ LD = i686-pc-mingw32-g++ STRIP = i686-pc-mingw32-strip --strip-unneeded +WINDRES = i686-pc-mingw32-windres else CC = i586-mingw32msvc-gcc CXX = i586-mingw32msvc-g++ LD = i586-mingw32msvc-g++ STRIP = i586-mingw32msvc-strip --strip-unneeded +WINDRES = i586-mingw32msvc-windres endif endif endif @@ -47,6 +51,8 @@ LDFLAGS += $(LDFLAGS_BASIC) -Wl,--enable-auto-image-base -Wl,--export-dynamic -- LIBS += -L../gnuwin32/lib ../libreadline-static.a -lz.dll -lucl.dll -lwsock32 -lws2_32 ../pthreads-w32-2-8-0-release/libpthreadGC2.a +IUP_LIBS = -lole32 -lcomctl32 -lgdi32 -lcomdlg32 + vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex vpath %.cpp ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml:../lua-modules/src:../Baltisot/MSVC/iconv:../Baltisot/MSVC/regex @@ -237,19 +243,22 @@ luac.exe: $(LUAC_OBJECTS) lua-interface.dll: $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_MAIN_OBJECTS) $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_MAIN_OBJECTS) $(LDFLAGS) $(LUAINTERFACE_LDFLAGS) $(LIBS) -lua-interface.exe: $(LUAINTERFACE_OBJECTS) - $(LD) -o lua-interface.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) +lua-interface.exe: $(LUAINTERFACE_OBJECTS) lua-interface-res.o + $(LD) -o lua-interface.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) lua-interface-res.o -lua-interface-light.exe: lua-interface-light.dll $(LUAINTERFACE_OBJECTS) - $(LD) -o lua-interface-light.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) +lua-interface-light.exe: lua-interface-light.dll $(LUAINTERFACE_OBJECTS) lua-interface-res.o + $(LD) -o lua-interface-light.exe $(LUAINTERFACE_OBJECTS) ./lua-interface.a $(LDFLAGS) $(LIBS) lua-interface-res.o lua-interface-light.dll: $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_LIGHT_OBJECTS) - $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_LIGHT_OBJECTS) $(LIBS) $(LDFLAGS) + $(LD) -shared -Wl,--output-def=lua-interface.def -Wl,--out-implib=lua-interface.a -o lua-interface.dll $(LUAINTERFACE_DLL_OBJECTS) $(LUAINTERFACE_LIGHT_OBJECTS) $(LIBS) $(LDFLAGS) ../lua-modules-iup-win32/luaiup.a $(IUP_LIBS) touch lua-interface-light.dll lua-interface-light.o: lua-interface.cpp $(CC) $(CPPFLAGS) -c -o lua-interface-light.o src/lua-interface.cpp -DLUA_INTERFACE_LIGHT +lua-interface-res.o: src/lua-interface.rc src/lua-interface.manifest src/lua.ico src/pen.cur + $(WINDRES) -o lua-interface-res.o src/lua-interface.rc + clean: rm -f lua-interface.dll lua-interface.exe lua-interface-light.exe luac.exe *.o *.dep *.a *.def |