Commit graph

8757 commits

Author SHA1 Message Date
Philippe Teuwen
a04c8cb41c cosmetic 2020-04-18 20:42:38 +02:00
Philippe Teuwen
f94a98b9c6 cmake qt5: no need for custom command if AUTOMOC? 2020-04-18 20:14:18 +02:00
Philippe Teuwen
17aacae8d3 fix clean path after src reorg 2020-04-18 20:13:46 +02:00
Philippe Teuwen
45134859cf cmake: remove unneeded PIC in hardnested lib 2020-04-18 20:01:51 +02:00
Philippe Teuwen
c2ff11f321 hardnested compilation reorganized to be similar with cmake approach 2020-04-18 19:41:14 +02:00
Philippe Teuwen
26c28c188a minor 2020-04-18 18:20:19 +02:00
Philippe Teuwen
f9857a8b0c cmake: add cflags 2020-04-18 17:37:11 +02:00
Philippe Teuwen
dc6b751ea3 cmake: rework includes, wip, need to modify more src after merge 2020-04-18 16:27:20 +02:00
Philippe Teuwen
f32974bb07 cmake libs static 2020-04-18 16:27:20 +02:00
Philippe Teuwen
2aa587f35f cmake: reveng keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen
b5ce5c1d99 cmake: mbedtls keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen
1ccd764837 cmake: hardnested 2020-04-18 16:27:20 +02:00
Philippe Teuwen
c5d2655ebe cmake: fix reveng defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen
0b68f3b81e cmake: fix zlib defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen
b7fb3b0746 cmake: fix jansson defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen
0fc5c41a49 cmake: fix liblua platform definitions to match regular Makefile 2020-04-18 16:27:20 +02:00
Philippe Teuwen
397f46c0ef cmake: Fix the (not yet used) amiibo srcs 2020-04-18 16:27:20 +02:00
Philippe Teuwen
7d1ef452b9 update gitignore 2020-04-18 16:27:20 +02:00
Philippe Teuwen
01432fd84b Lower cmake min version to 3.10 for WSL 2020-04-18 16:24:29 +02:00
Philippe Teuwen
1a344a933d Remove header files from CMakeLists 2020-04-18 16:24:29 +02:00
Uli Heilmeier
18f875cb84 cmake macOS: use brew installed readline 2020-04-18 16:24:29 +02:00
Uli Heilmeier
c888fcdb7e Fix cmake qt: remove REQUIRED 2020-04-18 16:24:29 +02:00
TrustedUser
5003434885 ¨fix: osc cmake 2020-04-18 16:24:29 +02:00
Uli Heilmeier
6562c22029 Fix qt5_found handling 2020-04-18 16:24:29 +02:00
Uli Heilmeier
64e7aa4c46 cmake: fix qt handling for macos
This is like we find qt in the Wireshark project.

Tested it with macOS. Not tested with Linux, Windows etc.
2020-04-18 16:24:29 +02:00
Iceman
4e233c682d Update CMakeLists.txt 2020-04-18 16:24:29 +02:00
Philippe Teuwen
ad28dc1fa0 cmake: remove custom rule for .ui, we already have AUTOUIC 2020-04-18 16:24:29 +02:00
Philippe Teuwen
fdccfb2b88 add cmake build in Travis 2020-04-18 16:24:29 +02:00
Bjoern Kerler
78a5e666bb Fix QT5 GUI CMake 2020-04-18 16:24:29 +02:00
Bjoern Kerler
6b1a8b8390 Add cmake support 2020-04-18 16:24:29 +02:00
Philippe Teuwen
edb96e75cf Add QT_NO_DEBUG flag 2020-04-18 12:20:42 +02:00
Philippe Teuwen
7acc43fe9f Removing debug flag 2020-04-18 12:10:03 +02:00
iceman1001
69142baa7f chg: "hf topaz info" - textual 2020-04-17 10:30:18 +02:00
iceman1001
40c69b3f83 chg: "lf hitag info" - added HITAG type detection (Thanks! @cosmo61) 2020-04-17 10:29:54 +02:00
Philippe Teuwen
367ae694d9 clarify homebrew instructions 2020-04-16 21:25:30 +02:00
iceman1001
c2f4b18add chg: updated gitignore file to match new folder structure 2020-04-16 16:53:28 +02:00
iceman1001
b0854bb3aa chg: SOCKET: connections (@xianling1998) 2020-04-16 16:46:45 +02:00
iceman1001
1bf32aad90 Chg: android adaptions from @xianglin1998 2020-04-16 16:46:09 +02:00
iceman1001
914316d194 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-16 14:16:24 +02:00
Philippe Teuwen
315cda0754
Merge pull request #692 from kalekume/patch-2
Added new AID F001D0
2020-04-16 11:58:35 +02:00
iceman1001
d55c34e378 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-16 11:56:25 +02:00
Bjoern Kerler
81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +02:00
kalekume
68f269ee3d
Added new AID F001D0 2020-04-16 10:36:42 +02:00
iceman1001
c6473afcc1 text 2020-04-16 09:53:31 +02:00
Philippe Teuwen
94192d0976 make style 2020-04-16 09:01:14 +02:00
iceman1001
588f7e98f5 more aid:s-... 2020-04-16 08:12:08 +02:00
Iceman
f2945e8567
Merge pull request #689 from netvader/patch-4
Update aid_desfire.json
2020-04-15 09:58:37 +02:00
netvader
6ad5c1f872
Update aid_desfire.json 2020-04-15 09:55:55 +02:00
Iceman
4a7d2838ec
Merge pull request #688 from mwalker33/Settings-2
Quick Fix
2020-04-15 09:47:28 +02:00
mwalker33
bdc4aae6a6 Typo 2020-04-15 17:42:11 +10:00