a little more reasonable

13 files changed, 20 insertions, 19 deletions

diff --git a/README b/README
index dd46893..dd46893 100755..100644
--- a/README
+++ b/README
diff --git a/include/aes_omac.h b/include/aes_omac.h
index 06150a4..06150a4 100755..100644
--- a/include/aes_omac.h
+++ b/include/aes_omac.h
diff --git a/include/elf.h b/include/elf.h
index 9bf5efb..9bf5efb 100755..100644
--- a/include/elf.h
+++ b/include/elf.h
diff --git a/include/keys.h b/include/keys.h
index 95d1f9a..95d1f9a 100755..100644
--- a/include/keys.h
+++ b/include/keys.h
diff --git a/include/oddkeys.h b/include/oddkeys.h
index b1647e4..b1647e4 100755..100644
--- a/include/oddkeys.h
+++ b/include/oddkeys.h
diff --git a/include/ps3_common.h b/include/ps3_common.h
index 83df640..83df640 100755..100644
--- a/include/ps3_common.h
+++ b/include/ps3_common.h
diff --git a/include/self.h b/include/self.h
index ca71e49..ca71e49 100755..100644
--- a/include/self.h
+++ b/include/self.h
diff --git a/include/sha1_hmac.h b/include/sha1_hmac.h
index 7087406..7087406 100755..100644
--- a/include/sha1_hmac.h
+++ b/include/sha1_hmac.h
diff --git a/make_self_npdrm/make_self.c b/make_self.c
index 6185739..f0d0805 100755..100644
--- a/make_self_npdrm/make_self.c
+++ b/make_self.c
@@ -13,15 +13,15 @@
 #include <openssl/aes.h>

 #include "zlib.h"

 

-#include "../include/ps3_common.h"

-#include "../include/elf.h"

-#include "../include/keys.h"

-#include "../include/oddkeys.h"

-#include "../include/sha1_hmac.h"

+#include "include/ps3_common.h"

+#include "include/elf.h"

+#include "include/keys.h"

+#include "include/oddkeys.h"

+#include "include/sha1_hmac.h"

 

-#include "../include/self.h"

+#include "include/self.h"

 

-#include "../include/aes_omac.h"

+#include "include/aes_omac.h"

 

 //#define NO_CRYPT

 #define NPDRM

diff --git a/make_self_npdrm/makefile b/make_self_npdrm/makefile
deleted file mode 100755
index 4967434..0000000
--- a/make_self_npdrm/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-windows: make_self.c

-	gcc make_self.c -I"C:\Program Files (x86)\GnuWin32\include" -L"C:\OpenSSL-Win32\lib\MinGW" -lgmp -leay32 "C:\Program Files (x86)\GnuWin32\bin\zlib1.dll" -o make_self_npdrm.exe

-

-linux: make_self.c

-	gcc make_self.c -lgmp -lcrypto -lz -o make_self_npdrm

diff --git a/makefile b/makefile
new file mode 100644
index 0000000..90a4059
--- /dev/null
+++ b/makefile
@@ -0,0 +1,11 @@
+linux: make_self.c package_finalize.c

+	gcc make_self.c -lgmp -lcrypto -lz -o build/make_self_npdrm

+	gcc package_finalize.c -lcrypto -o build/package_finalize

+

+windows: make_self.c package_finalize.c

+	gcc make_self.c -I"C:\Program Files (x86)\GnuWin32\include" -L"C:\OpenSSL-Win32\lib\MinGW" -lgmp -leay32 "C:\Program Files (x86)\GnuWin32\bin\zlib1.dll" -o build/make_self_npdrm.exe

+	gcc package_finalize.c -L"C:\OpenSSL-Win32\lib\MinGW" -leay32 -o build/package_finalize.exe

+	

+osx:

+	gcc make_self.c  -I/opt/local/include -I/opt/local -L/opt/local/lib -lgmp -lcrypto -lz -o build/make_self_npdrm

+	gcc package_finalize.c  -I/opt/local/include -I/opt/local -L/opt/local/lib -lcrypto -o build/package_finalize

diff --git a/package_finalize/package_finalize.c b/package_finalize.c
index 78cc725..472f887 100755..100644
--- a/package_finalize/package_finalize.c
+++ b/package_finalize.c
@@ -6,8 +6,8 @@
 #include <stdlib.h>

 #include <string.h>

 

-#include "../include/ps3_common.h"

-#include "../include/oddkeys.h"

+#include "include/ps3_common.h"

+#include "include/oddkeys.h"

 #include <openssl/sha.h>

 #include <openssl/aes.h>

 

diff --git a/package_finalize/makefile b/package_finalize/makefile
deleted file mode 100755
index f306cc0..0000000
--- a/package_finalize/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-windows: package_finalize.c

-	gcc package_finalize.c -L"C:\OpenSSL-Win32\lib\MinGW" -leay32 -o package_finalize.exe

-

-linux: package_finalize.c

-	gcc package_finalize.c -lcrypto -o package_finalize