diff options
| -rw-r--r-- | build/dep-extract.bat | 22 | ||||
| -rw-r--r-- | src/makeinc.skel.mak | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/build/dep-extract.bat b/build/dep-extract.bat index a088c6a2..e89f2018 100644 --- a/build/dep-extract.bat +++ b/build/dep-extract.bat @@ -1,5 +1,6 @@ @echo off -set PATH=%PATH%;%PROGRAMW6432%\7-Zip +set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef + cd ..\dep-x64 7z x -y *.rpm 7z x *.cpio @@ -7,11 +8,17 @@ del *.cpio xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* . rmdir /q /s usr set OPATH=%PATH% -set PATH=%PATH%;c:\mozilla-build\python-2.7-x64 -python ..\build\convert-lib-x64.py +set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64 +cd lib +for %%A in (..\bin\*.dll) do ( + gendef %%A + lib /nologo /machine:x64 /def:%%~nA.def +) +cd .. set PATH=%OPATH% 7z x *.7z copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h + cd ..\dep-x86 7z x -y *.rpm 7z x *.cpio @@ -19,8 +26,13 @@ del *.cpio xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* . rmdir /q /s usr set OPATH=%PATH% -set PATH=%PATH%;c:\mozilla-build\python-2.7-x86 -python ..\build\convert-lib-x86.py +set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE +cd lib +for %%A in (..\bin\*.dll) do ( + gendef ..\bin\%%A + lib /nologo /machine:x86 /def:%%~nA.def +) +cd .. set PATH=%OPATH% 7z x *.7z copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak index ee3f1101..03fa43e8 100644 --- a/src/makeinc.skel.mak +++ b/src/makeinc.skel.mak @@ -9,7 +9,7 @@ LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib GLIB = /I$(DEV)\include\glib-2.0 /I$(DEV)\lib\glib-2.0\include /I$(DEV)\include\libxml2 GTK = /I$(DEV)\include\gtk-2.0 /I$(DEV)\lib\gtk-2.0\include /I$(DEV)\include\atk-1.0 /I$(DEV)\include\cairo /I$(DEV)\include\pango-1.0 /I$(DEV)\include\gdk-pixbuf-2.0 -LIBS = $(LIBS) /libpath:$(DEV)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib xml2.lib +LIBS = $(LIBS) /libpath:$(DEV)\lib libgtk-win32-2.0-0.lib libgdk-win32-2.0-0.lib libatk-1.0-0.lib libgio-2.0-0.lib libgdk_pixbuf-2.0-0.lib libpangowin32-1.0-0.lib libpangocairo-1.0-0.lib libpango-1.0-0.lib libcairo-2.lib libgobject-2.0-0.lib libgmodule-2.0-0.lib libglib-2.0-0.lib libintl-8.lib libxml2-2.lib LUALIB = lua51 LUAOUTPUT = xclua.dll |