Bladeren bron

Fix Win32 build: directly refer to the .snk file and cope with new

assembly installation locations.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3064 92316355-f0b4-4df1-b90c-862c8a59935f
remotes/tiles
sam 16 jaren geleden
bovenliggende
commit
a955512cc9
2 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. +2
    -2
      build-win32
  2. +2
    -1
      pipi-sharp/Makefile.am

+ 2
- 2
build-win32 Bestand weergeven

@@ -41,8 +41,8 @@ cp -r "win32/gtksharp/"* "${INSTALLDIR}/"
find "${INSTALLDIR}/" -name .svn -prune -exec rm -rf '{}' ';'

# Install pipi-sharp
mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/"
rm -Rf "${INSTALLDIR}/lib/pipi-sharp"
mv "${INSTALLDIR}/lib/mono/gac/pipi-sharp/"*/* "${INSTALLDIR}/bin/"
rm -Rf "${INSTALLDIR}/lib/mono"

mkdir "${INSTALLDIR}/doc"
for f in COPYING NOTES; do


+ 2
- 1
pipi-sharp/Makefile.am Bestand weergeven

@@ -19,7 +19,8 @@ EXTRA_DIST = $(pipi_sources) $(test_sources) \
pipi-sharp.snk pipi-sharp.pc.in pipi-sharp.dll.config.in

pipi-sharp.dll: $(pipi_sources)
$(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library
$(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library \
-keyfile:$(srcdir)/pipi-sharp.snk

test.exe: $(test_sources) pipi-sharp.dll
$(GMCS) -debug $(test_sources) -out:$@ -lib:./ \


Laden…
Annuleren
Opslaan