Skip to content

Commit 375ca6d

Browse files
Totto16Totto16
committed
fix: fix include header paths
1 parent 7421a89 commit 375ca6d

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎src/FFI.hs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,56 +40,56 @@ import StdInt (CI32, CI64, CI8, CU32, CU64, CU8)
4040
import Structs (GridPropertiesC, RecordingInformationC)
4141
import Types (AdditionalInformationC, AdditionalInformationFieldC, EnumTypeC, RecordingReturnValueC)
4242

43-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_is_recording_file" c_is_recording_file :: ConstPtr CChar -> IO CBool
43+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_is_recording_file" c_is_recording_file :: ConstPtr CChar -> IO CBool
4444

45-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_get_keys" c_additional_information_get_keys :: Ptr AdditionalInformationC -> IO (ConstPtr (Ptr CChar))
45+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_get_keys" c_additional_information_get_keys :: Ptr AdditionalInformationC -> IO (ConstPtr (Ptr CChar))
4646

47-
foreign import capi "oopetris/oopetris_wrapper.h &oopetris_additional_information_keys_free" c_additional_information_keys_free :: FunPtr (Ptr (Ptr CChar) -> IO ())
47+
foreign import capi "oopetris/c_wrapper/wrapper.h &oopetris_additional_information_keys_free" c_additional_information_keys_free :: FunPtr (Ptr (Ptr CChar) -> IO ())
4848

49-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_get_field" c_additional_information_get_field :: Ptr AdditionalInformationC -> ConstPtr CChar -> ConstPtr AdditionalInformationFieldC
49+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_get_field" c_additional_information_get_field :: Ptr AdditionalInformationC -> ConstPtr CChar -> ConstPtr AdditionalInformationFieldC
5050

51-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_type" c_additional_information_field_get_type :: ConstPtr AdditionalInformationFieldC -> EnumTypeC
51+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_type" c_additional_information_field_get_type :: ConstPtr AdditionalInformationFieldC -> EnumTypeC
5252

53-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_string" c_additional_information_field_get_string :: ConstPtr AdditionalInformationFieldC -> ConstPtr CChar
53+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_string" c_additional_information_field_get_string :: ConstPtr AdditionalInformationFieldC -> ConstPtr CChar
5454

55-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_float" c_additional_information_field_get_float :: ConstPtr AdditionalInformationFieldC -> CFloat
55+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_float" c_additional_information_field_get_float :: ConstPtr AdditionalInformationFieldC -> CFloat
5656

57-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_double" c_additional_information_field_get_double :: ConstPtr AdditionalInformationFieldC -> CDouble
57+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_double" c_additional_information_field_get_double :: ConstPtr AdditionalInformationFieldC -> CDouble
5858

59-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_bool" c_additional_information_field_get_bool :: ConstPtr AdditionalInformationFieldC -> CBool
59+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_bool" c_additional_information_field_get_bool :: ConstPtr AdditionalInformationFieldC -> CBool
6060

61-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_u8" c_additional_information_field_get_u8 :: ConstPtr AdditionalInformationFieldC -> CU8
61+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_u8" c_additional_information_field_get_u8 :: ConstPtr AdditionalInformationFieldC -> CU8
6262

63-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_i8" c_additional_information_field_get_i8 :: ConstPtr AdditionalInformationFieldC -> CI8
63+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_i8" c_additional_information_field_get_i8 :: ConstPtr AdditionalInformationFieldC -> CI8
6464

65-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_u32" c_additional_information_field_get_u32 :: ConstPtr AdditionalInformationFieldC -> CU32
65+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_u32" c_additional_information_field_get_u32 :: ConstPtr AdditionalInformationFieldC -> CU32
6666

67-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_i32" c_additional_information_field_get_i32 :: ConstPtr AdditionalInformationFieldC -> CI32
67+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_i32" c_additional_information_field_get_i32 :: ConstPtr AdditionalInformationFieldC -> CI32
6868

69-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_u64" c_additional_information_field_get_u64 :: ConstPtr AdditionalInformationFieldC -> CU64
69+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_u64" c_additional_information_field_get_u64 :: ConstPtr AdditionalInformationFieldC -> CU64
7070

71-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_i64" c_additional_information_field_get_i64 :: ConstPtr AdditionalInformationFieldC -> CI64
71+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_i64" c_additional_information_field_get_i64 :: ConstPtr AdditionalInformationFieldC -> CI64
7272

73-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_additional_information_field_get_vector" c_additional_information_field_get_vector :: ConstPtr AdditionalInformationFieldC -> ConstPtr (ConstPtr AdditionalInformationFieldC)
73+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_additional_information_field_get_vector" c_additional_information_field_get_vector :: ConstPtr AdditionalInformationFieldC -> ConstPtr (ConstPtr AdditionalInformationFieldC)
7474

75-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_get_recording_information" c_get_recording_information :: ConstPtr CChar -> IO (Ptr RecordingReturnValueC)
75+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_get_recording_information" c_get_recording_information :: ConstPtr CChar -> IO (Ptr RecordingReturnValueC)
7676

77-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_is_error" c_is_error :: Ptr RecordingReturnValueC -> CBool
77+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_is_error" c_is_error :: Ptr RecordingReturnValueC -> CBool
7878

79-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_get_error" c_get_error :: Ptr RecordingReturnValueC -> ConstPtr CChar
79+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_get_error" c_get_error :: Ptr RecordingReturnValueC -> ConstPtr CChar
8080

81-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_get_information" c_get_information :: Ptr RecordingReturnValueC -> Ptr RecordingInformationC
81+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_get_information" c_get_information :: Ptr RecordingReturnValueC -> Ptr RecordingInformationC
8282

83-
foreign import capi "oopetris/oopetris_wrapper.h &oopetris_free_recording_information" c_free_recording_information :: FunPtr (Ptr RecordingInformationC -> IO ())
83+
foreign import capi "oopetris/c_wrapper/wrapper.h &oopetris_free_recording_information" c_free_recording_information :: FunPtr (Ptr RecordingInformationC -> IO ())
8484

85-
foreign import capi "oopetris/oopetris_wrapper.h &oopetris_free_recording_value_only" c_free_recording_value_only :: FunPtr (Ptr RecordingReturnValueC -> IO ())
85+
foreign import capi "oopetris/c_wrapper/wrapper.h &oopetris_free_recording_value_only" c_free_recording_value_only :: FunPtr (Ptr RecordingReturnValueC -> IO ())
8686

87-
foreign import capi "oopetris/oopetris_wrapper.h &oopetris_free_recording_value_whole" c_free_recording_value_whole :: FunPtr (Ptr RecordingReturnValueC -> IO ())
87+
foreign import capi "oopetris/c_wrapper/wrapper.h &oopetris_free_recording_value_whole" c_free_recording_value_whole :: FunPtr (Ptr RecordingReturnValueC -> IO ())
8888

89-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_get_lib_version" c_get_lib_version :: ConstPtr CChar
89+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_get_lib_version" c_get_lib_version :: ConstPtr CChar
9090

91-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_get_grid_properties" c_get_grid_properties :: IO (Ptr GridPropertiesC)
91+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_get_grid_properties" c_get_grid_properties :: IO (Ptr GridPropertiesC)
9292

93-
foreign import capi "oopetris/oopetris_wrapper.h &oopetris_free_grid_properties" c_free_grid_properties :: FunPtr (Ptr GridPropertiesC -> IO ())
93+
foreign import capi "oopetris/c_wrapper/wrapper.h &oopetris_free_grid_properties" c_free_grid_properties :: FunPtr (Ptr GridPropertiesC -> IO ())
9494

95-
foreign import capi "oopetris/oopetris_wrapper.h oopetris_array_len" c_array_len :: Ptr () -> CSize
95+
foreign import capi "oopetris/c_wrapper/wrapper.h oopetris_array_len" c_array_len :: Ptr () -> CSize

‎src/Structs.hs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ cSizeOfPatch a = if remainder == 0 then sz else (res + 1) * al
6161
sz = cSizeOf a
6262
(res, remainder) = sz `divMod` al
6363

64-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisTetrionRecord" #-} TetrionRecordC = TetrionRecordC
64+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisTetrionRecord" #-} TetrionRecordC = TetrionRecordC
6565
{ c_r_simulation_step_index :: CU64,
6666
c_event :: EnumTypeC,
6767
c_r_tetrion_index :: CU8
@@ -87,7 +87,7 @@ instance Storable TetrionRecordC where
8787
peek :: Ptr TetrionRecordC -> IO TetrionRecordC
8888
peek = cPeek
8989

90-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOpetrisMinoPosition" #-} MinoPositionC = MinoPositionC
90+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOpetrisMinoPosition" #-} MinoPositionC = MinoPositionC
9191
{ c_x :: CU8,
9292
c_y :: CU8
9393
}
@@ -111,7 +111,7 @@ instance Storable MinoPositionC where
111111
peek :: Ptr MinoPositionC -> IO MinoPositionC
112112
peek = cPeek
113113

114-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisMino" #-} MinoC = MinoC
114+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisMino" #-} MinoC = MinoC
115115
{ c_position :: MinoPositionC,
116116
c_type :: EnumTypeC
117117
}
@@ -135,7 +135,7 @@ instance Storable MinoC where
135135
peek :: Ptr MinoC -> IO MinoC
136136
peek = cPeek
137137

138-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOpetrisTetrionSnapshot" #-} TetrionSnapshotC = TetrionSnapshotC
138+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOpetrisTetrionSnapshot" #-} TetrionSnapshotC = TetrionSnapshotC
139139
{ c_level :: CU32,
140140
c_mino_stack :: Ptr MinoC,
141141
c_score :: CU64,
@@ -167,7 +167,7 @@ instance Storable TetrionSnapshotC where
167167
peek :: Ptr TetrionSnapshotC -> IO TetrionSnapshotC
168168
peek = cPeek
169169

170-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisTetrionHeader" #-} TetrionHeaderC = TetrionHeaderC
170+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisTetrionHeader" #-} TetrionHeaderC = TetrionHeaderC
171171
{ c_seed :: CU64,
172172
c_starting_level :: CU32
173173
}
@@ -191,7 +191,7 @@ instance Storable TetrionHeaderC where
191191
peek :: Ptr TetrionHeaderC -> IO TetrionHeaderC
192192
peek = cPeek
193193

194-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisRecordingInformation" #-} RecordingInformationC = RecordingInformationC
194+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisRecordingInformation" #-} RecordingInformationC = RecordingInformationC
195195
{ c_information :: Ptr AdditionalInformationC,
196196
c_records :: Ptr TetrionRecordC,
197197
c_snapshots :: Ptr TetrionSnapshotC,
@@ -221,7 +221,7 @@ instance Storable RecordingInformationC where
221221
peek :: Ptr RecordingInformationC -> IO RecordingInformationC
222222
peek = cPeek
223223

224-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisGridProperties" #-} GridPropertiesC = GridPropertiesC
224+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisGridProperties" #-} GridPropertiesC = GridPropertiesC
225225
{ c_height :: CU32,
226226
c_width :: CU32
227227
}

‎src/Types.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module Types (AdditionalInformationC, AdditionalInformationFieldC, RecordingRetu
33
import StdInt (CI32)
44

55
-- opaque type
6-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisAdditionalInformation" #-} AdditionalInformationC
6+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisAdditionalInformation" #-} AdditionalInformationC
77

88
-- opaque type
9-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisAdditionalInformationField" #-} AdditionalInformationFieldC
9+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisAdditionalInformationField" #-} AdditionalInformationFieldC
1010

1111
-- opaque type
12-
data {-# CTYPE "oopetris/oopetris_wrapper.h" "OOPetrisRecordingReturnValue" #-} RecordingReturnValueC
12+
data {-# CTYPE "oopetris/c_wrapper/wrapper.h" "OOPetrisRecordingReturnValue" #-} RecordingReturnValueC
1313

1414
-- enum return type
1515
type EnumTypeC = CI32

0 commit comments

Comments
 (0)