diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-04-27 12:18:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 12:18:49 +0100 |
| commit | 7936d466c58f6f2603900fbbc9d18b56ac2e4b4c (patch) | |
| tree | 714d9f371901f7083cf38fc547d46df32d16f16e /gui | |
| parent | 6f76041029393c6823973a29426b28c8c2d0b064 (diff) | |
| parent | 5687e9684cccc74e9dfa040c59a04d61e0851d54 (diff) | |
| download | pcsxr-7936d466c58f6f2603900fbbc9d18b56ac2e4b4c.tar.gz | |
Merge pull request #8 from loathingKernel/travis
Add Travis CI support for Linux and OS X
Diffstat (limited to 'gui')
| -rw-r--r--[-rwxr-xr-x] | gui/AboutDlg.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/AboutDlg.h | 0 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/Cheat.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/Cheat.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/ConfDlg.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/ConfDlg.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/DebugMemory.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/DebugMemory.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/GtkGui.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/Linux.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/LnxMain.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/MemcardDlg.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/MemcardDlg.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/Plugin.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | gui/nopic.h | 0 | ||||
| -rw-r--r-- | gui/po/CMakeLists.txt | 2 |
17 files changed, 2 insertions, 3 deletions
diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index 4f5d02ae..4f5d02ae 100755..100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c diff --git a/gui/AboutDlg.h b/gui/AboutDlg.h index f5001985..f5001985 100755..100644 --- a/gui/AboutDlg.h +++ b/gui/AboutDlg.h diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 93c9c328..5d333a02 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,9 +1,8 @@ -message(STATUS "* Configuring gui") +message(STATUS "* Configuring UI") include(GlibCompileResourcesSupport) #deps - find_package(GLib REQUIRED) if(NOT GLib_FOUND) message(FATAL_ERROR "GLIB2 library not found") diff --git a/gui/Cheat.c b/gui/Cheat.c index 3ecb6468..3ecb6468 100755..100644 --- a/gui/Cheat.c +++ b/gui/Cheat.c diff --git a/gui/Cheat.h b/gui/Cheat.h index a79876dc..a79876dc 100755..100644 --- a/gui/Cheat.h +++ b/gui/Cheat.h diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index d55234f8..d55234f8 100755..100644 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c diff --git a/gui/ConfDlg.h b/gui/ConfDlg.h index b8b9d4e6..b8b9d4e6 100755..100644 --- a/gui/ConfDlg.h +++ b/gui/ConfDlg.h diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c index 9bd4d322..9bd4d322 100755..100644 --- a/gui/DebugMemory.c +++ b/gui/DebugMemory.c diff --git a/gui/DebugMemory.h b/gui/DebugMemory.h index 1091a39f..1091a39f 100755..100644 --- a/gui/DebugMemory.h +++ b/gui/DebugMemory.h diff --git a/gui/GtkGui.c b/gui/GtkGui.c index 9ac46749..9ac46749 100755..100644 --- a/gui/GtkGui.c +++ b/gui/GtkGui.c diff --git a/gui/Linux.h b/gui/Linux.h index 2a939050..2a939050 100755..100644 --- a/gui/Linux.h +++ b/gui/Linux.h diff --git a/gui/LnxMain.c b/gui/LnxMain.c index d6dd9316..d6dd9316 100755..100644 --- a/gui/LnxMain.c +++ b/gui/LnxMain.c diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index 666a21e0..666a21e0 100755..100644 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c diff --git a/gui/MemcardDlg.h b/gui/MemcardDlg.h index 82d669d7..82d669d7 100755..100644 --- a/gui/MemcardDlg.h +++ b/gui/MemcardDlg.h diff --git a/gui/Plugin.c b/gui/Plugin.c index 389f4246..389f4246 100755..100644 --- a/gui/Plugin.c +++ b/gui/Plugin.c diff --git a/gui/nopic.h b/gui/nopic.h index 553cede5..553cede5 100755..100644 --- a/gui/nopic.h +++ b/gui/nopic.h diff --git a/gui/po/CMakeLists.txt b/gui/po/CMakeLists.txt index 4695aba5..d1eb2a6d 100644 --- a/gui/po/CMakeLists.txt +++ b/gui/po/CMakeLists.txt @@ -1,4 +1,4 @@ -message(STATUS "* Configuring langs") +message(STATUS "* Configuring translations") include(Gettext) #find_package(LibArchive REQUIRED) |