kopia lustrzana https://github.com/Hamlib/Hamlib
Move includes in the files where they are used
Makes the other files less dependent on being included by hamlib.swg and more self-contained. Need to explicitly add %include for amplist.h, riglist.h, rotlist.h to have the definitions picked up by SWIG even if they are included by their main file.
rodzic
10895d1abe
commit
afc70e2539
|
@ -19,6 +19,12 @@
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
%{
|
||||||
|
#include <hamlib/amplifier.h>
|
||||||
|
%}
|
||||||
|
|
||||||
|
%include <hamlib/amplist.h>
|
||||||
|
%include <hamlib/amplifier.h>
|
||||||
|
|
||||||
%inline %{
|
%inline %{
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,6 @@
|
||||||
|
|
||||||
#include <hamlib/config.h>
|
#include <hamlib/config.h>
|
||||||
|
|
||||||
#include <hamlib/rig.h>
|
|
||||||
#include <hamlib/rotator.h>
|
|
||||||
#include <hamlib/amplifier.h>
|
|
||||||
//mdblack98 -- Commented this out -- is anybody using the functions in misc.h?
|
//mdblack98 -- Commented this out -- is anybody using the functions in misc.h?
|
||||||
//If so, then those functions should be moved to rig.h
|
//If so, then those functions should be moved to rig.h
|
||||||
//#include "misc.h"
|
//#include "misc.h"
|
||||||
|
@ -222,15 +219,6 @@
|
||||||
|
|
||||||
%include <hamlib/rig_dll.h>
|
%include <hamlib/rig_dll.h>
|
||||||
|
|
||||||
%include <hamlib/riglist.h>
|
|
||||||
%include <hamlib/rig.h>
|
|
||||||
|
|
||||||
%include <hamlib/rotlist.h>
|
|
||||||
%include <hamlib/rotator.h>
|
|
||||||
|
|
||||||
%include <hamlib/amplist.h>
|
|
||||||
%include <hamlib/amplifier.h>
|
|
||||||
|
|
||||||
%inline {
|
%inline {
|
||||||
typedef const char * const_char_string;
|
typedef const char * const_char_string;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,12 @@
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
%{
|
||||||
|
#include <hamlib/rig.h>
|
||||||
|
%}
|
||||||
|
|
||||||
|
%include <hamlib/riglist.h>
|
||||||
|
%include <hamlib/rig.h>
|
||||||
|
|
||||||
%inline %{
|
%inline %{
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,12 @@
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
%{
|
||||||
|
#include <hamlib/rotator.h>
|
||||||
|
%}
|
||||||
|
|
||||||
|
%include <hamlib/rotator.h>
|
||||||
|
%include <hamlib/rotlist.h>
|
||||||
|
|
||||||
%inline %{
|
%inline %{
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue