diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-11-11 14:18:17 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-11-11 14:18:17 (GMT) |
| commit | 4e5ba64d11e52db98170d2cd67025839763ea6b2 (patch) | |
| tree | aebce8f18233a2919ddd829cc3b5eecd76da43b3 | |
| parent | a35fbb2a4340d73cbdca05cd8200c906af79bdaa (diff) | |
| download | mxe-4e5ba64d11e52db98170d2cd67025839763ea6b2.zip mxe-4e5ba64d11e52db98170d2cd67025839763ea6b2.tar.gz mxe-4e5ba64d11e52db98170d2cd67025839763ea6b2.tar.bz2 | |
package glfw2: remove unnecessary patch and run make cleanup-style
| -rw-r--r-- | src/glfw2-1-no-build-test.patch | 25 | ||||
| -rw-r--r-- | src/glfw2-test.c | 6 | ||||
| -rw-r--r-- | src/glfw2.mk | 5 |
3 files changed, 7 insertions, 29 deletions
diff --git a/src/glfw2-1-no-build-test.patch b/src/glfw2-1-no-build-test.patch deleted file mode 100644 index 3f26022..0000000 --- a/src/glfw2-1-no-build-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Do not waste time building examples and tests. We use our test - ---- a/Makefile -+++ b/Makefile -@@ -128,13 +128,13 @@ - - cross-mgw: - cd lib/win32 && $(MAKE) -f Makefile.win32.cross-mgw -- cd examples && $(MAKE) -f Makefile.win32.cross-mgw -- cd tests && $(MAKE) -f Makefile.win32.cross-mgw -+ #cd examples && $(MAKE) -f Makefile.win32.cross-mgw -+ #cd tests && $(MAKE) -f Makefile.win32.cross-mgw - - cross-mgw-clean: - cd lib/win32 && $(MAKE) -f Makefile.win32.cross-mgw clean -- cd examples && $(MAKE) -f Makefile.win32.cross-mgw clean -- cd tests && $(MAKE) -f Makefile.win32.cross-mgw clean -+ #cd examples && $(MAKE) -f Makefile.win32.cross-mgw clean -+ #cd tests && $(MAKE) -f Makefile.win32.cross-mgw clean - - - ########################################################################### diff --git a/src/glfw2-test.c b/src/glfw2-test.c index 8542147..b7c473e 100644 --- a/src/glfw2-test.c +++ b/src/glfw2-test.c @@ -13,16 +13,16 @@ int main(void) { return EXIT_FAILURE; } - + /* Open a window and create its OpenGL context */ if( !glfwOpenWindow( 640, 480, 0,0,0,0, 0,0, GLFW_WINDOW ) ) { glfwTerminate(); return EXIT_FAILURE; } - + /* Close OpenGL window and terminate GLFW*/ glfwTerminate(); - + return EXIT_SUCCESS; } diff --git a/src/glfw2.mk b/src/glfw2.mk index 8257a25..de7abec 100644 --- a/src/glfw2.mk +++ b/src/glfw2.mk @@ -19,7 +19,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(MAKE) -C '$(1)' -j '$(JOBS)' cross-mgw-install TARGET=$(TARGET)- PREFIX='$(PREFIX)/$(TARGET)' + cd '$(1)/lib/win32' && $(MAKE) -f Makefile.win32.cross-mgw \ + TARGET=$(TARGET)- \ + PREFIX='$(PREFIX)/$(TARGET)' \ + install -j '$(JOBS)' #Test '$(TARGET)-gcc' \ |