diff options
| author | Ray Hogenson <rayhogenson@gmail.com> | 2012-01-14 19:09:16 -0900 |
|---|---|---|
| committer | Ray Hogenson <rayhogenson@gmail.com> | 2012-01-14 19:09:16 -0900 |
| commit | 95cce1be8aac074afd8943c6a96b89be58929456 (patch) | |
| tree | 8b50557db4eca7ba98dd4e94530152f28adf5dda /os | |
| parent | Fixed the windows makefile (diff) | |
| download | yetihack-95cce1be8aac074afd8943c6a96b89be58929456.tar.zst | |
Fixed all makefiles
Diffstat (limited to 'os')
| -rw-r--r-- | os/linux/Makefile | 9 | ||||
| -rw-r--r-- | os/windows/Makefile | 12 | ||||
| -rw-r--r-- | os/windows/install.nsi | 6 |
3 files changed, 13 insertions, 14 deletions
diff --git a/os/linux/Makefile b/os/linux/Makefile index 8feeb50..44de839 100644 --- a/os/linux/Makefile +++ b/os/linux/Makefile @@ -3,11 +3,12 @@ yetihack: package: make clean - zip package/yetihack-source.zip ../YetiHack + zip package/yetihack-source.zip `pwd` make yetihack strip src/yetihack sudo chown root:root src/yetihack - ln src/yetihack os/debian/deb/usr/bin/ + -sudo rm os/debian/deb/usr/bin/yetihack + sudo ln src/yetihack os/debian/deb/usr/bin/ dpkg-deb --build os/debian/deb package/yetihack.deb cd package && sudo alien -r yetihack.deb zip package/yetihack.zip src/yetihack @@ -18,6 +19,6 @@ install: yetihack clean: -rm src/*.o -rm src/yetihack - -rm os/package/yetihack.deb - -rm os/package/*.rpm + -rm package/* + -sudo rm os/debian/deb/usr/bin/yetihack diff --git a/os/windows/Makefile b/os/windows/Makefile index 5ee19c9..94c335d 100644 --- a/os/windows/Makefile +++ b/os/windows/Makefile @@ -4,17 +4,15 @@ yetihack.exe: src/YetiHack.cpp ln src/yetihack.exe os/windows/yetihack-windows/ package: yetihack.exe - YETIHACKDIR=`pwd` - export YETIHACKDIR makensis os/windows/install.nsi - zip yetihack-windows.zip os/windows/yetihack-windows + zip package/yetihack-windows.zip os/windows/yetihack-windows install: yetihack.exe ./YetiHack_installer.exe clean: - -rm yetihack.exe - -rm YetiHack_installer.exe - -rm yetihack-windows.zip - -rm yetihack-windows/yetihack.exe + -rm src/yetihack.exe + -rm package/YetiHack_installer.exe + -rm package/yetihack-windows.zip + -rm os/windows/yetihack-windows/yetihack.exe diff --git a/os/windows/install.nsi b/os/windows/install.nsi index 507acba..dfb0d65 100644 --- a/os/windows/install.nsi +++ b/os/windows/install.nsi @@ -11,7 +11,7 @@ Name "YetiHack Installer"
; The file to write
-OutFile "YetiHack_installer.exe"
+OutFile "../../package/YetiHack_installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES\YetiHack
@@ -42,8 +42,8 @@ Section "YetiHack" SectionIn RO
SetOutPath $INSTDIR
- File "$YETIHACKDIR/src/yetihack.exe"
- File "/usr/i586-mingw32msvc/bin/pdcurses.dll"
+ File "../../src/yetihack.exe"
+ File "yetihack-windows/pdcurses.dll"
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\YetiHack "Install_Dir" "$INSTDIR"
|