SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update scripts for gendef usage

This commit is contained in:
Berke Viktor 2011-08-15 05:39:26 +02:00
parent 858db21519
commit 2c9e9dfc9b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/dep-extract.bat
View File

@ -1,5 +1,6 @@
@echo off @echo off
set PATH=%PATH%;%PROGRAMW6432%\7-Zip set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
cd ..\dep-x64 cd ..\dep-x64
7z x -y *.rpm 7z x -y *.rpm
7z x *.cpio 7z x *.cpio
@ -7,11 +8,17 @@ del *.cpio
xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* . xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* .
rmdir /q /s usr rmdir /q /s usr
set OPATH=%PATH% set OPATH=%PATH%
set PATH=%PATH%;c:\mozilla-build\python-2.7-x64 set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
python ..\build\convert-lib-x64.py cd lib
for %%A in (..\bin\*.dll) do (
gendef %%A
lib /nologo /machine:x64 /def:%%~nA.def
)
cd ..
set PATH=%OPATH% set PATH=%OPATH%
7z x *.7z 7z x *.7z
copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h
cd ..\dep-x86 cd ..\dep-x86
7z x -y *.rpm 7z x -y *.rpm
7z x *.cpio 7z x *.cpio
@ -19,8 +26,13 @@ del *.cpio
xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* . xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .
rmdir /q /s usr rmdir /q /s usr
set OPATH=%PATH% set OPATH=%PATH%
set PATH=%PATH%;c:\mozilla-build\python-2.7-x86 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
python ..\build\convert-lib-x86.py cd lib
for %%A in (..\bin\*.dll) do (
gendef ..\bin\%%A
lib /nologo /machine:x86 /def:%%~nA.def
)
cd ..
set PATH=%OPATH% set PATH=%OPATH%
7z x *.7z 7z x *.7z
copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h

2
src/makeinc.skel.mak
View File

@ -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 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 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 LUALIB = lua51
LUAOUTPUT = xclua.dll LUAOUTPUT = xclua.dll